diff --git a/.ci/environments/common/update_quarkus.sh b/.ci/environments/common/update_quarkus.sh
index eea7aac746..71f0d1a3c2 100755
--- a/.ci/environments/common/update_quarkus.sh
+++ b/.ci/environments/common/update_quarkus.sh
@@ -1,9 +1,28 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 set -euo pipefail
 
 mvn_cmd="mvn ${BUILD_MVN_OPTS:-} ${BUILD_MVN_OPTS_QUARKUS_UPDATE:-}"
 
-source <(curl -s https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/install_quarkus.sh)
+source <(curl -s https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/install_quarkus.sh)
 
 echo "Update project with Quarkus version ${QUARKUS_VERSION}"
 
diff --git a/.ci/environments/quarkus-3/after.sh b/.ci/environments/quarkus-3/after.sh
index 32f9a6ba6b..89de57acd8 100755
--- a/.ci/environments/quarkus-3/after.sh
+++ b/.ci/environments/quarkus-3/after.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 set -euo pipefail
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh
index 0636d08632..30e4520d4f 100755
--- a/.ci/environments/quarkus-3/before.sh
+++ b/.ci/environments/quarkus-3/before.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 set -euo pipefail
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
diff --git a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
index ef4a67020b..f4085cf234 100755
--- a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
+++ b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
diff --git a/.ci/environments/quarkus-3/quarkus3-base-recipe.yml b/.ci/environments/quarkus-3/quarkus3-base-recipe.yml
index 06f4b906da..58269018c3 100644
--- a/.ci/environments/quarkus-3/quarkus3-base-recipe.yml
+++ b/.ci/environments/quarkus-3/quarkus3-base-recipe.yml
@@ -1,17 +1,20 @@
 #
-# Copyright 2021 the original author or authors.
-# <p>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# <p>
-# https://www.apache.org/licenses/LICENSE-2.0
-# <p>
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #####
@@ -30,111 +33,111 @@ name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse
 recipeList:
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkus.bot
-      artifactId: 'build-reporter-*'
+      artifactId: "build-reporter-*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.vault
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.amazonservices
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.cxf
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.jsch
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.jberet
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.artemis
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.config
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.freemarker
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 1.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.githubapp
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.mybatis
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.messaginghub
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.prettytime
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.xmlsec
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.jef
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.githubaction
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.hibernatesearchextras
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.jackson-jq
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.jdbc
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.microprofile
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.minio
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.pact
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 1.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.poi
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.primefaces
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.reactivemessaging.http
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.renarde
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 3.x
   - org.openrewrite.maven.UpgradeDependencyVersion:
       groupId: io.quarkiverse.shardingsphere
-      artifactId: '*'
+      artifactId: "*"
       newVersion: 2.x
 
 ---
@@ -1147,13 +1150,13 @@ name: io.quarkus.updates.core.quarkus30.RenameJavaxServiceFiles
 displayName: Rename a file example
 recipeList:
   - org.openrewrite.RenameFile:
-      fileMatcher: '**/META-INF/services/javax.ws.rs.ext.Providers'
+      fileMatcher: "**/META-INF/services/javax.ws.rs.ext.Providers"
       fileName: jakarta.ws.rs.ext.Providers
   - org.openrewrite.RenameFile:
-      fileMatcher: '**/META-INF/services/javax.ws.rs.client.ClientBuilder'
+      fileMatcher: "**/META-INF/services/javax.ws.rs.client.ClientBuilder"
       fileName: jakarta.ws.rs.client.ClientBuilder
   - org.openrewrite.RenameFile:
-      fileMatcher: '**/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder'
+      fileMatcher: "**/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder"
       fileName: jakarta.ws.rs.sse.SseEventSource$Builder
 
 #####
@@ -1193,7 +1196,7 @@ recipeList:
   - org.openrewrite.text.FindAndReplace:
       find: quarkus-bootstrap-maven-plugin
       replace: quarkus-extension-maven-plugin
-      fileMatcher: '**/pom.xml'
+      fileMatcher: "**/pom.xml"
 
 #####
 # Adjust properties in application.properties
diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml
index 911d6c57b9..46b5569fed 100644
--- a/.ci/environments/quarkus-3/quarkus3.yml
+++ b/.ci/environments/quarkus-3/quarkus3.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: io.quarkus.openrewrite.Quarkus
 description: Update Quarkus version and refactor imports and resources if needed.
 type: specs.openrewrite.org/v1beta/recipe
diff --git a/.ci/environments/quarkus-branch/before.sh b/.ci/environments/quarkus-branch/before.sh
index d2cf2e71c0..a14e406f43 100755
--- a/.ci/environments/quarkus-branch/before.sh
+++ b/.ci/environments/quarkus-branch/before.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 set -euo pipefail
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
diff --git a/.ci/environments/quarkus-lts/before.sh b/.ci/environments/quarkus-lts/before.sh
index d2cf2e71c0..a14e406f43 100755
--- a/.ci/environments/quarkus-lts/before.sh
+++ b/.ci/environments/quarkus-lts/before.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 set -euo pipefail
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
diff --git a/.ci/environments/quarkus-main/before.sh b/.ci/environments/quarkus-main/before.sh
index d2cf2e71c0..a14e406f43 100755
--- a/.ci/environments/quarkus-main/before.sh
+++ b/.ci/environments/quarkus-main/before.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 set -euo pipefail
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
diff --git a/.ci/environments/update.sh b/.ci/environments/update.sh
index 80abdd7110..045654561d 100755
--- a/.ci/environments/update.sh
+++ b/.ci/environments/update.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 set -euo pipefail
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
@@ -44,4 +63,4 @@ if [ -f "${env_path}/after.sh" ]; then
 fi
 
 # Download `setup_integration_branch` script and execute
-curl -s https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/setup_integration_branch.sh | bash
\ No newline at end of file
+curl -s https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/setup_integration_branch.sh | bash
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
new file mode 100644
index 0000000000..12df4ee154
--- /dev/null
+++ b/.ci/jenkins/Jenkinsfile
@@ -0,0 +1,50 @@
+@Library('jenkins-pipeline-shared-libraries')_
+
+pr_check_script = null
+
+pipeline {
+    agent {
+        label 'ubuntu'
+    }
+    options {
+        timestamps()
+        timeout(time: 480, unit: 'MINUTES')
+        disableConcurrentBuilds(abortPrevious: true)
+        skipDefaultCheckout()
+    }
+    environment {
+        BUILDCHAIN_PROJECT = 'apache/incubator-kie-kogito-apps'
+
+        ENABLE_SONARCLOUD = 'false'
+        SONAR_PROJECT_KEY = 'apache_incubator-kie-kogito-apps'
+        KOGITO_APPS_BUILD_MVN_OPTS = '-Dvalidate-formatting -Prun-code-coverage'
+    }
+    stages {
+        stage('Initialize') {
+            steps {
+                cleanWs(disableDeferredWipeout: true)
+                script {
+                    // load `pr_check.groovy` file from kogito-pipelines:main
+                    dir('kogito-pipelines') {
+                        checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines', 'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds'))
+                        pr_check_script = load 'dsl/scripts/pr_check.groovy'
+                    }
+                }
+            }
+        }
+        stage('PR check') {
+            steps {
+                script {
+                    dir('kogito-pipelines') {
+                        pr_check_script.launch()
+                    }
+                }
+            }
+        }
+    }
+    post {
+        cleanup {
+            cleanWs()
+        }
+    }
+}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 3ec158f6fb..34664e57d0 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -8,12 +8,10 @@ deployProperties = [:]
 
 pipeline {
     agent {
-        label 'kie-rhel8 && docker && kie-mem16g && !built-in'
-    }
-
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
 
     options {
@@ -30,19 +28,15 @@ pipeline {
 
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
-        // Keep here for visitibility
-        MAVEN_OPTS = '-Xms1024m -Xmx4g'
-        NODE_OPTIONS = '--max_old_space_size=4096'
-
         PR_BRANCH_HASH = "${util.generateHash(10)}"
-        MAVEN_DEPLOY_LOCAL_DIR = "${WORKSPACE}/maven_deploy_dir"
+        MAVEN_DEPLOY_LOCAL_DIR = "/tmp/maven_deploy_dir"
     }
 
     stages {
         stage('Initialize') {
             steps {
                 script {
-                    cleanWs()
+                    cleanWs(disableDeferredWipeout: true)
 
                     if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME
@@ -61,8 +55,6 @@ pipeline {
                     dir(getRepoName()) {
                         checkoutRepo()
                     }
-
-                    setupCypressEnv('12.17.0')
                 }
             }
             post {
@@ -84,7 +76,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         if (githubscm.isBranchExist('origin',getPRBranch())) {
-                            githubscm.removeRemoteBranch('origin', getPRBranch())
+                            githubscm.removeRemoteBranch('origin', getPRBranch(), getGitAuthorPushCredsId())
                         }
                         githubscm.createBranch(getPRBranch())
                     }
@@ -98,7 +90,13 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        maven.mvnVersionsUpdateParentAndChildModules(getMavenCommand(), getProjectVersion(), !isRelease())
+                        configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                            maven.mvnVersionsUpdateParentAndChildModules(
+                                getMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
+                                getProjectVersion(),
+                                !isRelease()
+                            )
+                        }
                     }
                 }
             }
@@ -184,18 +182,12 @@ pipeline {
         }
         cleanup {
             script {
-                util.cleanNode('docker')
+                util.cleanNode()
             }
         }
     }
 }
 
-void setupCypressEnv(String cypressVersion) {
-    if (env.CYPRESS_BINARY_URL) {
-        env.CYPRESS_INSTALL_BINARY = "${CYPRESS_BINARY_URL}/cypress-${cypressVersion}.zip"
-    }
-}
-
 void sendNotification() {
     if (params.SEND_NOTIFICATION) {
         mailer.sendMarkdownTestSummaryNotification('Deploy', "[${getBuildBranch()}] Kogito Apps", [env.KOGITO_CI_EMAIL_TO])
@@ -214,7 +206,7 @@ void saveReports() {
 
 void checkoutRepo() {
     deleteDir()
-    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
+    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
 }
 
 void commitAndCreatePR() {
@@ -226,8 +218,8 @@ void commitAndCreatePR() {
         prBody += '\nPlease review and merge.'
     }
     githubscm.commitChanges(commitMsg, { githubscm.findAndStageNotIgnoredFiles('pom.xml') })
-    githubscm.pushObject('origin', getPRBranch(), getGitAuthorCredsID())
-    deployProperties["${getRepoName()}.pr.link"] = githubscm.createPRWithLabels(commitMsg, prBody, getBuildBranch(), ['skip-ci'] as String[], getGitAuthorCredsID()) 
+    githubscm.pushObject('origin', getPRBranch(), getGitAuthorPushCredsId())
+    deployProperties["${getRepoName()}.pr.link"] = githubscm.createPRWithLabels(commitMsg, prBody, getBuildBranch(), ['skip-ci'] as String[], getGitAuthorCredsId()) 
 }
 
 boolean isSpecificArtifactsUpload() {
@@ -239,7 +231,7 @@ boolean shouldStageArtifacts() {
 }
 
 boolean shouldDeployToRepository() {
-    return env.MAVEN_DEPLOY_REPOSITORY && env.MAVEN_REPO_CREDS_ID && getGitAuthor() == 'kiegroup'
+    return env.MAVEN_DEPLOY_REPOSITORY && env.MAVEN_REPO_CREDS_ID && getGitAuthor() == 'apache'
 }
 
 boolean isRelease() {
@@ -259,8 +251,8 @@ String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
 
-String getGitAuthorCredsID() {
-    return env.AUTHOR_CREDS_ID
+String getGitAuthorCredsId() {
+    return env.GIT_AUTHOR_CREDS_ID
 }
 
 String getBuildBranch() {
@@ -283,7 +275,6 @@ void setDeployPropertyIfNeeded(String key, def value) {
 
 MavenCommand getMavenCommand() {
     return new MavenCommand(this, ['-fae', '-ntp'])
-            .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
             .withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : [])
             .withProperty('full')
 }
@@ -297,21 +288,26 @@ void runMavenDeploy(boolean skipTests = true, boolean localDeployment = false) {
         mvnCmd.withDeployRepository(env.MAVEN_DEPLOY_REPOSITORY)
     }
 
-    mvnCmd.withProperty('maven.test.failure.ignore', true)
-        .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
-        .withOptions(env.KOGITO_APPS_BUILD_MVN_OPTS ? [ env.KOGITO_APPS_BUILD_MVN_OPTS ] : [])
-        .skipTests(skipTests)
-        .run('clean deploy')
+    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+        mvnCmd.withProperty('maven.test.failure.ignore', true)
+            .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
+            .withOptions(env.KOGITO_APPS_BUILD_MVN_OPTS ? [ env.KOGITO_APPS_BUILD_MVN_OPTS ] : [])
+            .skipTests(skipTests)
+            .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+            .run('clean deploy')
+    }
 }
 
 void runMavenStage() {
-    MavenStagingHelper stagingHelper = getStagingHelper()
-    deployProperties.putAll(stagingHelper.stageLocalArtifacts(env.NEXUS_STAGING_PROFILE_ID, getLocalDeploymentFolder()))
-    stagingHelper.promoteStagingRepository(env.NEXUS_BUILD_PROMOTION_PROFILE_ID)
+    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+        MavenStagingHelper stagingHelper = getStagingHelper(getMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE))
+        deployProperties.putAll(stagingHelper.stageLocalArtifacts(env.NEXUS_STAGING_PROFILE_ID, getLocalDeploymentFolder()))
+        stagingHelper.promoteStagingRepository(env.NEXUS_BUILD_PROMOTION_PROFILE_ID)
+    }
 }
 
-MavenStagingHelper getStagingHelper() {
-    return new MavenStagingHelper(this, getMavenCommand())
+MavenStagingHelper getStagingHelper(MavenCommand mavenCommand) {
+    return new MavenStagingHelper(this, mavenCommand)
             .withNexusReleaseUrl(env.NEXUS_RELEASE_URL)
             .withNexusReleaseRepositoryId(env.NEXUS_RELEASE_REPOSITORY_ID)
 }
diff --git a/.ci/jenkins/Jenkinsfile.optaplanner b/.ci/jenkins/Jenkinsfile.optaplanner
index 51e2147049..7c81c104fc 100644
--- a/.ci/jenkins/Jenkinsfile.optaplanner
+++ b/.ci/jenkins/Jenkinsfile.optaplanner
@@ -2,18 +2,17 @@
 
 import org.kie.jenkins.MavenCommand
 
-droolsRepo = 'drools'
-optaplannerRepo = 'optaplanner'
-kogitoRuntimesRepo = 'kogito-runtimes'
-kogitoAppsRepo = 'kogito-apps'
+droolsRepo = 'incubator-kie-drools'
+optaplannerRepo = 'incubator-kie-optaplanner'
+kogitoRuntimesRepo = 'incubator-kie-kogito-runtimes'
+kogitoAppsRepo = 'incubator-kie-kogito-apps'
 
 pipeline {
     agent {
-        label 'kie-rhel8 && docker && kie-mem16g'
-    }
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
     options {
         timestamps()
@@ -21,7 +20,6 @@ pipeline {
     }
     environment {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-        MAVEN_OPTS = '-Xms1024m -Xmx6g'
     }
     stages {
         stage('Initialize') {
@@ -37,18 +35,24 @@ pipeline {
         stage('Build Drools') {
             steps {
                 script {
-                    getMavenCommand(droolsRepo)
-                        .withProperty('quickly')
-                        .run('clean install')
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                        getMavenCommand(droolsRepo)
+                            .withProperty('quickly')
+                            .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                            .run('clean install')
+                    }
                 }
             }
         }
         stage('Build Optaplanner') {
             steps {
                 script {
-                    getMavenCommand(optaplannerRepo)
-                        .withProperty('quickly')
-                        .run('clean install')
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                        getMavenCommand(optaplannerRepo)
+                            .withProperty('quickly')
+                            .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                            .run('clean install')
+                    }
                 }
             }
         }
@@ -70,22 +74,28 @@ pipeline {
         stage('Build Runtimes') {
             steps {
                 script {
-                    getMavenCommand(kogitoRuntimesRepo)
-                        .withProperty('quickly')
-                        .run('clean install')
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                        getMavenCommand(kogitoRuntimesRepo)
+                            .withProperty('quickly')
+                            .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                            .run('clean install')
+                        }
                 }
             }
         }
         stage('Build Apps') {
             steps {
                 script {
-                    getMavenCommand(kogitoAppsRepo)
-                        .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
-                        .withProperty('skipUI')
-                        .withProperty('maven.test.failure.ignore', true)
-                        .withProperty('version.org.optaplanner', env.OPTAPLANNER_VERSION)
-                        .withProperty('optaplanner') // Use specific profile https://github.com/kiegroup/kogito-apps/blob/48a5c8f9a905a2c17b9d0e01cee744902a4824f0/pom.xml#L63
-                        .run('clean install')
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                        getMavenCommand(kogitoAppsRepo)
+                            .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
+                            .withProperty('skipUI')
+                            .withProperty('maven.test.failure.ignore', true)
+                            .withProperty('version.org.optaplanner', env.OPTAPLANNER_VERSION)
+                            .withProperty('optaplanner') // Use specific profile https://github.com/apache/incubator-kie-kogito-apps/blob/48a5c8f9a905a2c17b9d0e01cee744902a4824f0/pom.xml#L63
+                            .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                            .run('clean install')
+                    }
                 }
             }
             post {
@@ -96,11 +106,6 @@ pipeline {
                         util.archiveConsoleLog()
                     }
                 }
-                cleanup {
-                    script {
-                        cleanContainers()
-                    }
-                }
             }
         }
     }
@@ -110,7 +115,7 @@ pipeline {
         }
         cleanup {
             script {
-                util.cleanNode('docker')
+                util.cleanNode()
             }
         }
     }
@@ -134,7 +139,7 @@ void checkoutDroolsRepo() {
 
 void checkoutOptaplannerRepo() {
     dir(optaplannerRepo) {
-        checkout(githubscm.resolveRepository(optaplannerRepo, 'kiegroup', getOptaPlannerBranch(), false))
+        checkout(githubscm.resolveRepository(optaplannerRepo, 'apache', getOptaPlannerBranch(), false))
     }
 }
 
@@ -169,16 +174,11 @@ String getOptaPlannerBranch() {
 
 MavenCommand getMavenCommand(String directory) {
     return new MavenCommand(this, ['-fae', '-ntp'])
-                .withSettingsXmlId('kogito_release_settings')
                 .withProperty('java.net.preferIPv4Stack', true)
                 .withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : [])
                 .inDirectory(directory)
 }
 
-void cleanContainers() {
-    cloud.cleanContainersAndImages('docker')
-}
-
 String getNativeBuilderImage() {
     return env.NATIVE_BUILDER_IMAGE
 }
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 9fab40bf99..62804e64c2 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -6,7 +6,10 @@ pipelineProperties = [:]
 
 pipeline {
     agent {
-        label 'rhel8 && !built-in'
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
 
     options {
@@ -16,15 +19,13 @@ pipeline {
 
     environment {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-
-        NODE_OPTIONS = '--max_old_space_size=4096'
     }
 
     stages {
         stage('Initialization') {
             steps {
                 script {
-                    cleanWs()
+                    cleanWs(disableDeferredWipeout: true)
 
                     if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME
@@ -55,11 +56,11 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         checkoutRepo()
-                        if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
-                            githubscm.deleteRelease(getGitTag(), getGitAuthorCredsID())
+                        if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsId())) {
+                            githubscm.deleteRelease(getGitTag(), getGitAuthorCredsId())
                         }
-                        githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorCredsID())
-                        githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
+                        githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorCredsId())
+                        githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsId())
                     }
                 }
             }
@@ -71,7 +72,7 @@ pipeline {
         }
         cleanup {
             script {
-                util.cleanNode('docker')
+                util.cleanNode()
             }
         }
     }
@@ -144,8 +145,12 @@ String getGitAuthor() {
     return env.GIT_AUTHOR
 }
 
-String getGitAuthorCredsID() {
-    return env.AUTHOR_CREDS_ID
+String getGitAuthorCredsId() {
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
 String getDeployPrLink() {
@@ -158,20 +163,20 @@ String getDeployPrLink() {
 
 void checkoutRepo() {
     deleteDir()
-    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
+    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
     // need to manually checkout branch since on a detached branch after checkout command
     sh "git checkout ${getBuildBranch()}"
 }
 
 void mergeAndPush(String prLink) {
     if (prLink) {
-        githubscm.mergePR(prLink, getGitAuthorCredsID())
-        githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
+        githubscm.mergePR(prLink, getGitAuthorCredsId())
+        githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
     }
 }
 
 void tagLatest() {
     if (getGitTag()) {
-        githubscm.tagLocalAndRemoteRepository('origin', getGitTag(), getGitAuthorCredsID(), env.BUILD_TAG, true)
+        githubscm.tagLocalAndRemoteRepository('origin', getGitTag(), getGitAuthorPushCredsId(), env.BUILD_TAG, true)
     }
 }
diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr
index 1f8920ee78..73e25a9eb6 100644
--- a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr
+++ b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.pr
@@ -8,11 +8,10 @@ changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 
 pipeline {
     agent {
-        label 'kie-rhel8 && kie-mem16g && !built-in'
-    }
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
     options {
         timestamps()
@@ -22,13 +21,13 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
-                    cleanWs()
+                    cleanWs(disableDeferredWipeout: true)
 
                     sh 'printenv > env_props'
                     archiveArtifacts artifacts: 'env_props'
 
                     dir(getRepoName()) {
-                        checkout(githubscm.resolveRepository(getRepoName(), changeAuthor, changeBranch, false))
+                        checkout(githubscm.resolveRepository(getRepoName(), changeAuthor, changeBranch, false, getGitAuthorCredsId()))
                         // need to manually checkout branch since on a detached branch after checkout command
                         sh "git checkout ${changeBranch}"
                     }
@@ -38,11 +37,16 @@ pipeline {
         stage('Build upstream projects') {
             steps {
                 script {
-                    [ 'drools', 'kogito-runtimes' ].each { project -> 
+                    [ 'incubator-kie-drools', 'incubator-kie-kogito-runtimes' ].each { project -> 
                         dir(project) {
-                            githubscm.checkoutIfExists(project, changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
+                            githubscm.checkoutIfExists(project, changeAuthor, changeBranch, 'apache', changeTarget, true)
                             sh '.ci/environments/update.sh quarkus-3'
-                            getMavenCommand().withProperty('quickly').run('clean install')
+                            configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                                getMavenCommand()
+                                    .withProperty('quickly')
+                                    .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                                    .run('clean install')
+                            }
                         }
                     }
                 }
@@ -66,17 +70,15 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        githubscm.pushObject('origin', changeBranch, getGitAuthorCredsId())
+                        githubscm.pushObject('origin', changeBranch, getGitAuthorPushCredsId())
                     }
                 }
             }
         }
     }
     post {
-        always {
-            script {
-                cleanWs()
-            }
+        cleanup {
+            cleanWs()
         }
         unsuccessful {
             script {
@@ -91,12 +93,15 @@ String getRepoName() {
 }
 
 String getGitAuthorCredsId() {
-    return env.AUTHOR_CREDS_ID
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
 MavenCommand getMavenCommand() {
     return new MavenCommand(this, ['-fae', '-ntp'])
-                .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
                 .withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : [])
                 .withProperty('enforcer.skip')
 }
diff --git a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone
index 18fb14c6f6..6c8fe19e67 100644
--- a/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone
+++ b/.ci/jenkins/Jenkinsfile.quarkus-3.rewrite.standalone
@@ -7,12 +7,10 @@ previousHash = ''
 
 pipeline {
     agent {
-        label 'kie-rhel8 && kie-mem16g && !built-in'
-    }
-
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
 
     options {
@@ -57,11 +55,16 @@ pipeline {
         stage('Build upstream projects') {
             steps {
                 script {
-                    [ 'drools', 'kogito-runtimes' ].each { project -> 
+                    [ 'incubator-kie-drools', 'incubator-kie-kogito-runtimes' ].each { project -> 
                         dir(project) {
                             githubscm.checkoutIfExists(project, getGitAuthor(), getBuildBranch(), getBaseAuthor(), getBaseBranch(), true)
                             sh '.ci/environments/update.sh quarkus-3'
-                            getMavenCommand().withProperty('quickly').run('clean install')
+                            configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                                getMavenCommand()
+                                    .withProperty('quickly')
+                                    .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                                    .run('clean install')
+                            }
                         }
                     }
                 }
@@ -85,7 +88,7 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        githubscm.pushObject('origin', isPRSourceBranch() ? getBuildBranch() : getPRBranch(), getGitAuthorCredsId())
+                        githubscm.pushObject('origin', isPRSourceBranch() ? getBuildBranch() : getPRBranch(), getGitAuthorPushCredsId())
                     }
                 }
             }
@@ -122,7 +125,7 @@ pipeline {
 
 void clean() {
     sh 'rm -rf ~/.rewrite-cache/'
-    util.cleanNode('docker')
+    util.cleanNode()
 }
 
 void sendErrorNotification() {
@@ -136,7 +139,7 @@ void sendNotification(String body) {
 }
 
 void checkoutRepo(String repository, String branch) {
-    checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false))
+    checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false, getGitAuthorCredsId()))
     // need to manually checkout branch since on a detached branch after checkout command
     sh "git checkout ${branch}"
 }
@@ -167,7 +170,11 @@ boolean isPRSourceBranch() {
 }
 
 String getGitAuthorCredsId() {
-    return env.AUTHOR_CREDS_ID
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
 String getPRBranch() {
@@ -176,7 +183,6 @@ String getPRBranch() {
 
 MavenCommand getMavenCommand() {
     return new MavenCommand(this, ['-fae', '-ntp'])
-                .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
                 .withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : [])
                 .withProperty('enforcer.skip')
 }
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 65c1f02606..3978a696e1 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -3,17 +3,15 @@ import org.jenkinsci.plugins.workflow.libs.Library
 
 import org.kie.jenkins.MavenCommand
 
-droolsRepo = 'drools'
-kogitoRuntimesRepo = 'kogito-runtimes'
+droolsRepo = 'incubator-kie-drools'
+kogitoRuntimesRepo = 'incubator-kie-kogito-runtimes'
 
 pipeline {
     agent {
-        label 'kie-rhel8 && !built-in'
-    }
-
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
 
     options {
@@ -21,24 +19,15 @@ pipeline {
         timeout(time: 60, unit: 'MINUTES')
     }
 
-    // parameters {
-    // For parameters, check into ./dsl/jobs.groovy file
-    // }
-
     environment {
-        // Static env is defined into ./dsl/jobs.groovy file
-
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-
-        // Keep here for visitibility
-        MAVEN_OPTS = '-Xms1024m -Xmx4g'
     }
 
     stages {
         stage('Initialize') {
             steps {
                 script {
-                    cleanWs()
+                    cleanWs(disableDeferredWipeout: true)
 
                     if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME
@@ -53,29 +42,41 @@ pipeline {
         stage('Build Drools') {
             steps {
                 script {
-                    getMavenCommand(droolsRepo)
-                        .withOptions(env.BUILD_MVN_OPTS_UPSTREAM ? [ env.BUILD_MVN_OPTS_UPSTREAM ] : [])
-                        .withOptions(env.DROOLS_BUILD_MVN_OPTS_UPSTREAM ? [ env.DROOLS_BUILD_MVN_OPTS_UPSTREAM ] : [])
-                        .withProperty('quickly')
-                        .run('clean install')
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                        getMavenCommand(droolsRepo)
+                            .withOptions(env.BUILD_MVN_OPTS_UPSTREAM ? [ env.BUILD_MVN_OPTS_UPSTREAM ] : [])
+                            .withOptions(env.DROOLS_BUILD_MVN_OPTS_UPSTREAM ? [ env.DROOLS_BUILD_MVN_OPTS_UPSTREAM ] : [])
+                            .withProperty('quickly')
+                            .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                            .run('clean install')
+                    }
                 }
             }
         }
         stage('Build Kogito Runtimes') {
             steps {
                 script {
-                    getMavenCommand(kogitoRuntimesRepo)
-                        .withOptions(env.BUILD_MVN_OPTS_UPSTREAM ? [ env.BUILD_MVN_OPTS_UPSTREAM ] : [])
-                        .withOptions(env.KOGITO_RUNTIMES_BUILD_MVN_OPTS_UPSTREAM ? [ env.KOGITO_RUNTIMES_BUILD_MVN_OPTS_UPSTREAM ] : [])
-                        .withProperty('quickly')
-                        .run('clean install')
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                        getMavenCommand(kogitoRuntimesRepo)
+                            .withOptions(env.BUILD_MVN_OPTS_UPSTREAM ? [ env.BUILD_MVN_OPTS_UPSTREAM ] : [])
+                            .withOptions(env.KOGITO_RUNTIMES_BUILD_MVN_OPTS_UPSTREAM ? [ env.KOGITO_RUNTIMES_BUILD_MVN_OPTS_UPSTREAM ] : [])
+                            .withProperty('quickly')
+                            .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                            .run('clean install')
+                    }
                 }
             }
         }
         stage('Update project version') {
             steps {
                 script {
-                    maven.mvnVersionsUpdateParentAndChildModules(getMavenCommand(getRepoName()), getKogitoVersion(), true)
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                        maven.mvnVersionsUpdateParentAndChildModules(
+                            getMavenCommand(getRepoName()).withSettingsXmlFile(MAVEN_SETTINGS_FILE),
+                            getKogitoVersion(),
+                            true
+                        )
+                    }
                 }
             }
         }
@@ -87,7 +88,7 @@ pipeline {
                             def commitMsg = "Update version to ${getKogitoVersion()}"
 
                             githubscm.commitChanges(commitMsg, { githubscm.findAndStageNotIgnoredFiles('pom.xml') })
-                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
+                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
                         } else {
                             println '[WARN] no changes to commit'
                         }
@@ -102,7 +103,7 @@ pipeline {
         }
         cleanup {
             script {
-                util.cleanNode('docker')
+                util.cleanNode()
             }
         }
     }
@@ -119,7 +120,7 @@ void sendNotification() {
 void checkoutRepo(String repository, String branch) {
     dir(repository) {
         deleteDir()
-        checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false))
+        checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false, getGitAuthorCredsId()))
         // need to manually checkout branch since on a detached branch after checkout command
         sh "git checkout ${branch}"
     }
@@ -154,13 +155,16 @@ String getKogitoVersion() {
     return params.KOGITO_VERSION
 }
 
-String getGitAuthorCredsID() {
-    return env.AUTHOR_CREDS_ID
+String getGitAuthorCredsId() {
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
 MavenCommand getMavenCommand(String directory) {
     return new MavenCommand(this, ['-fae', '-ntp'])
-                .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
                 .withOptions(env.BUILD_MVN_OPTS ? [ env.BUILD_MVN_OPTS ] : [])
                 .inDirectory(directory)
 }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 62a9df76a4..fb21019bf2 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -1,11 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
 * This file is describing all the Jenkins jobs in the DSL format (see https://plugins.jenkins.io/job-dsl/)
 * needed by the Kogito pipelines.
 *
-* The main part of Jenkins job generation is defined into the https://github.com/kiegroup/kogito-pipelines repository.
+* The main part of Jenkins job generation is defined into the https://github.com/apache/incubator-kie-kogito-pipelines repository.
 *
 * This file is making use of shared libraries defined in
-* https://github.com/kiegroup/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
+* https://github.com/apache/incubator-kie-kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
 */
 
 import org.kie.jenkins.jobdsl.model.JenkinsFolder
@@ -33,7 +51,6 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) {
                 id: 'kogito-apps',
                 primary: true,
                 env : [
-                    NODE_OPTIONS: '--max_old_space_size=4096',
                     // Sonarcloud analysis only on main branch
                     // As we have only Community edition
                     ENABLE_SONARCLOUD: EnvUtils.isDefaultEnvironment(this, jobFolder.getEnvironmentName()) && Utils.isMainBranch(this),
@@ -41,27 +58,27 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) {
                 ]
             ], [
                 id: 'kogito-quarkus-examples',
-                repository: 'kogito-examples',
+                repository: 'incubator-kie-kogito-examples',
                 dependsOn: 'kogito-apps',
                 env : [
                     KOGITO_EXAMPLES_SUBFOLDER_POM: 'kogito-quarkus-examples/',
-                    BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${isProdEnv(jobFolder) ? '' : (isNative(jobFolder) ? '-Pkogito-apps-downstream-native' : '-Pkogito-apps-downstream')}"
+                    BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${isNative(jobFolder) ? '-Pkogito-apps-downstream-native' : '-Pkogito-apps-downstream'}"
                 ],
             ], [
                 id: 'kogito-springboot-examples',
-                repository: 'kogito-examples',
+                repository: 'incubator-kie-kogito-examples',
                 dependsOn: 'kogito-apps',
                 env : [
                     KOGITO_EXAMPLES_SUBFOLDER_POM: 'kogito-springboot-examples/',
-                    BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${isProdEnv(jobFolder) ? '' : (isNative(jobFolder) ? '-Pkogito-apps-downstream-native' : '-Pkogito-apps-downstream')}"
+                    BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${isNative(jobFolder) ? '-Pkogito-apps-downstream-native' : '-Pkogito-apps-downstream'}"
                 ],
             ], [
                 id: 'serverless-workflow-examples',
-                repository: 'kogito-examples',
+                repository: 'incubator-kie-kogito-examples',
                 dependsOn: 'kogito-apps',
                 env : [
                     KOGITO_EXAMPLES_SUBFOLDER_POM: 'serverless-workflow-examples/',
-                    BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${isProdEnv(jobFolder) ? '' : (isNative(jobFolder) ? '-Pkogito-apps-downstream-native' : '-Pkogito-apps-downstream')}"
+                    BUILD_MVN_OPTS_CURRENT: "${defaultBuildMvnOptsCurrent} ${isNative(jobFolder) ? '-Pkogito-apps-downstream-native' : '-Pkogito-apps-downstream'}"
                 ],
             ]
         ]
@@ -84,35 +101,42 @@ List getAppsBuildMvnOptions(JenkinsFolder jobFolder) {
     return mvnOpts
 }
 
-boolean isProdEnv(JenkinsFolder jobFolder) {
-    return EnvUtils.hasEnvironmentId(this, jobFolder.getEnvironmentName(), 'prod')
-}
-
 boolean isNative(JenkinsFolder jobFolder) {
     return EnvUtils.hasEnvironmentId(this, jobFolder.getEnvironmentName(), 'native')
 }
 
 // PR checks
-KogitoJobUtils.createAllEnvironmentsPerRepoPRJobs(this) { jobFolder -> getMultijobPRConfig(jobFolder) }
+Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile")
 
 // Init branch
 createSetupBranchJob()
 
 // Nightly jobs
-Closure addNodeOptionsEnvJobParamsGetter = { script ->
-    def jobParams = JobParamsUtils.DEFAULT_PARAMS_GETTER(script)
-    jobParams.env.put('NODE_OPTIONS', '--max_old_space_size=4096')
-    return jobParams
-}
 Closure setup4AMCronTriggerJobParamsGetter = { script ->
-    def jobParams = addNodeOptionsEnvJobParamsGetter(script)
+    def jobParams = JobParamsUtils.DEFAULT_PARAMS_GETTER(script)
     jobParams.triggers = [ cron: 'H 4 * * *' ]
     return jobParams
 }
 
-Closure nightlyJobParamsGetter = isMainStream() ? addNodeOptionsEnvJobParamsGetter : setup4AMCronTriggerJobParamsGetter
-KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true, addNodeOptionsEnvJobParamsGetter)
-setupSpecificBuildChainNightlyJob('sonarcloud', nightlyJobParamsGetter)
+Closure setupAdditionalTimeout = { Closure paramsGetter ->
+    return { script ->
+        def jobParams = paramsGetter(script)
+        jobParams.env.put('ADDITIONAL_TIMEOUT', '480')
+        return jobParams
+    }
+}
+
+Closure setupSonarProjectKeyEnv = { Closure paramsGetter ->
+    return { script ->
+        def jobParams = paramsGetter(script)
+        jobParams.env.put('SONAR_PROJECT_KEY', 'apache_incubator-kie-kogito-apps')
+        return jobParams
+    }
+}
+
+Closure nightlyJobParamsGetter = isMainStream() ? JobParamsUtils.DEFAULT_PARAMS_GETTER : setup4AMCronTriggerJobParamsGetter
+KogitoJobUtils.createNightlyBuildChainBuildAndDeployJobForCurrentRepo(this, '', true, setupAdditionalTimeout(JobParamsUtils.DEFAULT_PARAMS_GETTER))
+setupSpecificBuildChainNightlyJob('sonarcloud', setupAdditionalTimeout(setupSonarProjectKeyEnv(nightlyJobParamsGetter)))
 setupSpecificBuildChainNightlyJob('native', nightlyJobParamsGetter)
 setupNightlyQuarkusIntegrationJob('quarkus-main', nightlyJobParamsGetter)
 setupNightlyQuarkusIntegrationJob('quarkus-branch', nightlyJobParamsGetter)
@@ -131,7 +155,8 @@ if (isMainStream()) {
     ])
     // Quarkus 3
     if (EnvUtils.isEnvironmentEnabled(this, 'quarkus-3')) {
-        setupPrQuarkus3RewriteJob()
+        // TODO create PR job with branch source plugin. how to ?
+        // setupPrQuarkus3RewriteJob() // Deactivated due to ghprb not available on Apache Jenkins
         setupStandaloneQuarkus3RewriteJob()
     }
 }
@@ -154,7 +179,7 @@ void setupSpecificBuildChainNightlyJob(String envName, Closure defaultJobParamsG
 
 void setupOptaplannerJob(String optaplannerBranch) {
     def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-apps-optaplanner-snapshot', JobType.NIGHTLY, 'ecosystem', "${jenkins_path}/Jenkinsfile.optaplanner", 'Kogito Apps Testing against Optaplanner snapshot')
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.triggers = [ cron : 'H 6 * * *' ]
     jobParams.env.putAll([
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
@@ -172,12 +197,13 @@ void setupOptaplannerJob(String optaplannerBranch) {
 
 void createSetupBranchJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-apps', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Apps Init branch')
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
 
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
 
         MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
 
@@ -198,13 +224,13 @@ void createSetupBranchJob() {
 
 void setupReleaseDeployJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-apps-deploy', JobType.RELEASE, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Apps Deploy')
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
 
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
 
         MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
         MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
@@ -235,7 +261,7 @@ void setupReleaseDeployJob() {
 
 void setupReleasePromoteJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-apps-promote', JobType.RELEASE, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Apps Promote')
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
         PROPERTIES_FILE_NAME: 'deployment.properties',
 
@@ -243,8 +269,8 @@ void setupReleasePromoteJob() {
 
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
 
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
 
         MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
         MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
@@ -270,7 +296,7 @@ void setupReleasePromoteJob() {
 
 void setupPrQuarkus3RewriteJob() {
     def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-apps.rewrite', JobType.PULL_REQUEST, 'quarkus-3', "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.pr", 'Kogito Apps Quarkus 3 rewrite patch regeneration')
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.jenkinsfile = "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.pr"
     jobParams.pr.putAll([
         run_only_for_branches: [ "${GIT_BRANCH}" ],
@@ -281,7 +307,8 @@ void setupPrQuarkus3RewriteJob() {
         commitContext: 'Quarkus 3 rewrite',
     ])
     jobParams.env.putAll([
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
         MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
     ])
     KogitoJobTemplate.createPRJob(this, jobParams)
@@ -290,9 +317,10 @@ void setupPrQuarkus3RewriteJob() {
 void setupStandaloneQuarkus3RewriteJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-apps.quarkus-3.rewrite', JobType.TOOLS, "${jenkins_path}/Jenkinsfile.quarkus-3.rewrite.standalone", 'Kogito Apps Quarkus 3 rewrite patch regeneration')
     jobParams.env.putAll(EnvUtils.getEnvironmentEnvVars(this, 'quarkus-3'))
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
         BASE_BRANCH: Utils.getGitBranch(this),
         BASE_AUTHOR: Utils.getGitAuthor(this),
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index ad8af34ac2..a15d034b0f 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -1,6 +1,25 @@
 #!/bin/bash -e
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 file=$(mktemp)
 # For more usage of the script, use ./test.sh -h
-curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
+curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
 chmod u+x ${file}
 ${file} $@
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9e826c14bf..d35739991e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Bug Report
 description: Report a bug in Kogito
 labels: kind/bug
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 07b5e85888..5ac7d62edf 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 blank_issues_enabled: true
 contact_links:
   - name: Jira 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index ea3857d267..1a0094c5e6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Feature request / Enhancement
 description: Request or propose a new feature/enhancement
 labels: kind/enhancement
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2dcf0d8f54..a939586c34 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: 2
 updates:
 - package-ecosystem: maven
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b85de6c416..1836c3c86a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,7 +2,7 @@ Many thanks for submitting your Pull Request :heart:!
 
 Please make sure that your PR meets the following requirements:
 
-- [ ] You have read the [contributors guide](https://github.com/kiegroup/kogito-runtimes#contributing-to-kogito)
+- [ ] You have read the [contributors guide](https://github.com/apache/incubator-kie-kogito-runtimes#contributing-to-kogito)
 - [ ] Pull Request title is properly formatted: `KOGITO-XYZ Subject`
 - [ ] Pull Request title contains the target branch if not targeting main: `[0.9.x] KOGITO-XYZ Subject`
 - [ ] Pull Request contains link to the JIRA issue
diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
index 12a88a29ff..ee509870bd 100644
--- a/.github/workflows/issues.yml
+++ b/.github/workflows/issues.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Workflows to notify the team about github issues
 
 on:
diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml
index 62b31d56de..c9dc69c0ed 100644
--- a/.github/workflows/pr-backporting.yml
+++ b/.github/workflows/pr-backporting.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Pull Request Backporting
 
 on:
@@ -17,7 +36,7 @@ jobs:
     steps:
       - name: Set target branches
         id: set-targets
-        uses: kiegroup/kie-ci/.ci/actions/parse-labels@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/parse-labels@main
         with:
           labels: ${LABELS}
   
@@ -34,7 +53,7 @@ jobs:
       REVIEWERS: ${{ toJSON(github.event.pull_request.requested_reviewers) }}
     steps:
       - name: Backporting
-        uses: kiegroup/kie-ci/.ci/actions/backporting@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/backporting@main
         with:
           target-branch: ${{ matrix.target-branch }}
           additional-reviewers: ${REVIEWERS}
diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml
index 04a3074a3c..ddf1fbb333 100644
--- a/.github/workflows/pr-downstream.yml
+++ b/.github/workflows/pr-downstream.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Downstream
 
 on:
@@ -26,41 +45,41 @@ jobs:
         maven-version: ['3.8.7']
         include:
           - job_name: kogito-quarkus-examples
-            repository: kogito-examples
+            repository: incubator-kie-kogito-examples
             env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-quarkus-examples/
           - job_name: kogito-springboot-examples
-            repository: kogito-examples
+            repository: incubator-kie-kogito-examples
             env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-springboot-examples/
           - job_name: serverless-workflow-examples
-            repository: kogito-examples
+            repository: incubator-kie-kogito-examples
             env_KOGITO_EXAMPLES_SUBFOLDER_POM: serverless-workflow-examples/
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.job_name }} (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }})
     steps:
       - name: Clean Disk Space
-        uses: kiegroup/kie-ci/.ci/actions/ubuntu-disk-space@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/ubuntu-disk-space@main
         if: ${{ matrix.os == 'ubuntu-latest' }}
       - name: Support long paths
         if: ${{ matrix.os == 'windows-latest' }}
-        uses: kiegroup/kie-ci/.ci/actions/long-paths@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/long-paths@main
       - name: Java and Maven Setup
-        uses: kiegroup/kie-ci/.ci/actions/maven@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/maven@main
         with:
           java-version: ${{ matrix.java-version }}
           maven-version: ${{ matrix.maven-version }}
           cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }}
       - name: Build Chain
-        uses: kiegroup/kie-ci/.ci/actions/build-chain@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/build-chain@main
         with:
-          definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml
+          definition-file: https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml
           annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }}
-          starting-project: kiegroup/${{ matrix.repository }}
+          starting-project: apache/${{ matrix.repository }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
         env: 
           KOGITO_EXAMPLES_SUBFOLDER_POM: ${{ matrix.env_KOGITO_EXAMPLES_SUBFOLDER_POM }}
       - name: Surefire Report
-        uses: kiegroup/kie-ci/.ci/actions/surefire-report@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/surefire-report@main
         if: ${{ always() }}
         with:
           report_paths: '**/*-reports/TEST-*.xml'
\ No newline at end of file
diff --git a/.github/workflows/pr-jenkins.yml b/.github/workflows/pr-jenkins.yml
index f0ca27557a..454e55ae6f 100644
--- a/.github/workflows/pr-jenkins.yml
+++ b/.github/workflows/pr-jenkins.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 name: Jenkins Tests
@@ -16,8 +35,8 @@ jobs:
     name: DSL
     steps:
     - name: DSL tests
-      uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main
+      uses: apache/incubator-kie-kogito-pipelines/.ci/actions/dsl-tests@main
       with:
-        main-config-file-repo: kiegroup/kogito-pipelines
+        main-config-file-repo: apache/incubator-kie-kogito-pipelines
         main-config-file-path: .ci/jenkins/config/main.yaml
-        branch-config-file-repo: kiegroup/kogito-pipelines
+        branch-config-file-repo: apache/incubator-kie-kogito-pipelines
diff --git a/.github/workflows/pr-kogito-apps.yml b/.github/workflows/pr-kogito-apps.yml
index 1b7051a650..930c437fab 100644
--- a/.github/workflows/pr-kogito-apps.yml
+++ b/.github/workflows/pr-kogito-apps.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Apps
 
 on:
@@ -17,7 +36,7 @@ jobs:
     concurrency:
       group: pr-kogito-apps_${{ matrix.os }}_${{ matrix.java-version }}_${{ matrix.maven-version }}_${{ github.head_ref }}
       cancel-in-progress: true
-    timeout-minutes: 210
+    timeout-minutes: 360
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -28,27 +47,27 @@ jobs:
     name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}
     steps:
       - name: Clean Disk Space
-        uses: kiegroup/kie-ci/.ci/actions/ubuntu-disk-space@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/ubuntu-disk-space@main
         if: ${{ matrix.os == 'ubuntu-latest' }}
       - name: Support long paths
         if: ${{ matrix.os == 'windows-latest' }}
-        uses: kiegroup/kie-ci/.ci/actions/long-paths@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/long-paths@main
       - name: Java and Maven Setup
-        uses: kiegroup/kie-ci/.ci/actions/maven@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/maven@main
         with:
           java-version: ${{ matrix.java-version }}
           maven-version: ${{ matrix.maven-version }}
           cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }}
       - name: Build Chain
-        uses: kiegroup/kie-ci/.ci/actions/build-chain@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/build-chain@main
         env:
           NODE_OPTIONS: "--max_old_space_size=4096"
         with:
-          definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml
+          definition-file: https://raw.githubusercontent.com/${GROUP:apache}/incubator-kie-kogito-pipelines/${BRANCH:main}/.ci/pull-request-config.yaml
           annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Surefire Report
-        uses: kiegroup/kie-ci/.ci/actions/surefire-report@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/surefire-report@main
         if: ${{ always() }}
         with:
           report_paths: '**/*-reports/TEST-*.xml'
diff --git a/.github/workflows/upstream-sync.yml b/.github/workflows/upstream-sync.yml
new file mode 100644
index 0000000000..069555f41b
--- /dev/null
+++ b/.github/workflows/upstream-sync.yml
@@ -0,0 +1,47 @@
+name: Sync main-apache branch with upstream/main
+
+env:
+  USERNAME: kie-ci
+  USEREMAIL: kie-ci0@redhat.com
+  UPSTREAM_REMOTE: https://github.com/apache/incubator-kie-kogito-apps.git
+  GITHUB_TOKEN: ${{ secrets.APACHE_SYNC_MIDSTREAM_TOKEN }}
+
+on:
+  schedule:
+    - cron: "0 0 * * *" # every day at midnight
+  workflow_dispatch:
+
+jobs:
+  sync-main-apache:
+    name: Sync main-apache branch
+    runs-on: ubuntu-latest
+ 
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.APACHE_SYNC_MIDSTREAM_TOKEN }}
+
+      - name: Setup git environment
+        run: |
+          git config --global user.name "$USERNAME"
+          git config --global user.email "$USEREMAIL"
+          git remote add upstream $UPSTREAM_REMOTE
+
+      - name: Fetch all
+        run: git fetch --all --tags
+
+      - name: Checkout main-apache branch
+        run: git checkout --track origin/main-apache
+
+      - name: Pull main-apache branch
+        run: git pull
+
+      - name: Merge upstream/main branch
+        run: git merge --no-edit upstream/main
+
+      - name: Push changes
+        run: git push
+
+      - name: Push last tag
+        run: git push origin $(git tag --sort=creatordate | tail -n 1)
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000000..6a7d335aa3
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,9 @@
+Apache KIE
+Copyright 2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The Initial Developer of some parts of the framework, which are copied from, derived from, or
+inspired by KIE (Knowledge Is Everthing) group, is Red Hat, Inc (https://www.redhat.com/).
+Copyright Red Hat, Inc. and/or its affiliates.. All Rights Reserved.
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/pom.xml
index cc85884b7b..a1e4ce2540 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/pom.xml
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Address.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Address.java
index a4aa77e78e..831e6a2e59 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Address.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Address.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.acme.travels;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Traveller.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Traveller.java
index 1be7d0b7c3..ff5e841dee 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Traveller.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/acme/travels/Traveller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.acme.travels;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
index 82341e8ff4..72aebeb09a 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index;
 
@@ -25,6 +28,7 @@
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.shaded.com.fasterxml.jackson.databind.JsonNode;
@@ -274,6 +278,7 @@ public void testProcessInstanceEvents() throws IOException {
 
     public void testProcessGatewayAPI() throws IOException {
         String pId2 = createTestProcessInstance();
+
         await()
                 .atMost(TIMEOUT)
                 .untilAsserted(() -> getProcessInstanceById(pId2, "ACTIVE"));
@@ -471,6 +476,18 @@ public void testProcessGatewayAPIComments(String taskId, String processInstanceI
                         .body("$.size()", is(1))
                         .body("[0].content", is(commentContent)));
 
+        await()
+                .atMost(TIMEOUT)
+                .untilAsserted(() -> given().spec(dataIndexSpec()).contentType(ContentType.JSON)
+                        .body("{ \"query\" : \"{ UserTaskInstances (where: { processInstanceId: {equal: \\\"" + processInstanceId + "\\\"}}) { " +
+                                "id description priority potentialGroups comments {id content updatedBy updatedAt} } }\"}")
+                        .when().post("/graphql")
+                        .then()
+                        .statusCode(200)
+                        .body("data.UserTaskInstances[0].comments", notNullValue())
+                        .body("data.UserTaskInstances[0].comments.size()", is(1))
+                        .extract().jsonPath().getMap("data.UserTaskInstances[0].comments[0]"));
+
         Map<String, String> commentMap = given().spec(dataIndexSpec()).contentType(ContentType.JSON)
                 .body("{ \"query\" : \"{ UserTaskInstances (where: { processInstanceId: {equal: \\\"" + processInstanceId + "\\\"}}) { " +
                         "id description priority potentialGroups comments {id content updatedBy updatedAt} } }\"}")
@@ -482,6 +499,7 @@ public void testProcessGatewayAPIComments(String taskId, String processInstanceI
                 .body("data.UserTaskInstances[0].potentialGroups[0]", equalTo("managers"))
                 .body("data.UserTaskInstances[0].comments.size()", is(1))
                 .extract().jsonPath().getMap("data.UserTaskInstances[0].comments[0]");
+
         checkExpectedCreatedItemData(commentCreationResult, commentMap);
         String commentNewContent = "commentNewContent";
         String commentUpdateResult = given().spec(dataIndexSpec()).contentType(ContentType.JSON)
@@ -569,18 +587,23 @@ public void testProcessGatewayAPIAttachments(String taskId, String processInstan
                         .body("$.size()", is(1))
                         .body("[0].name", is(attachmentName)));
 
-        Map<String, String> attachmentMap = given().spec(dataIndexSpec()).contentType(ContentType.JSON)
-                .body("{ \"query\" : \"{ UserTaskInstances (where: { processInstanceId: {equal: \\\"" + processInstanceId + "\\\"}}) { " +
-                        "id description priority potentialGroups attachments {id name content updatedBy updatedAt} } }\"}")
-                .when().post("/graphql")
-                .then()
-                .statusCode(200)
-                .body("data.UserTaskInstances[0].description", equalTo("NewDescription"))
-                .body("data.UserTaskInstances[0].priority", equalTo("low"))
-                .body("data.UserTaskInstances[0].potentialGroups[0]", equalTo("managers"))
-                .body("data.UserTaskInstances[0].attachments.size()", is(1))
-                .body("data.UserTaskInstances[0].attachments[0].name", equalTo(attachmentName))
-                .extract().jsonPath().getMap("data.UserTaskInstances[0].attachments[0]");
+        AtomicReference<Map<String, String>> attachmentMapRef = new AtomicReference<>();
+        await()
+                .atMost(TIMEOUT)
+                .untilAsserted(() -> attachmentMapRef.set(given().spec(dataIndexSpec()).contentType(ContentType.JSON)
+                        .body("{ \"query\" : \"{ UserTaskInstances (where: { processInstanceId: {equal: \\\"" + processInstanceId + "\\\"}}) { " +
+                                "id description priority potentialGroups attachments {id name content updatedBy updatedAt} } }\"}")
+                        .when().post("/graphql")
+                        .then()
+                        .statusCode(200)
+                        .body("data.UserTaskInstances[0].description", equalTo("NewDescription"))
+                        .body("data.UserTaskInstances[0].priority", equalTo("low"))
+                        .body("data.UserTaskInstances[0].potentialGroups[0]", equalTo("managers"))
+                        .body("data.UserTaskInstances[0].attachments.size()", is(1))
+                        .body("data.UserTaskInstances[0].attachments[0].name", equalTo(attachmentName))
+                        .extract().jsonPath().getMap("data.UserTaskInstances[0].attachments[0]")));
+
+        Map<String, String> attachmentMap = attachmentMapRef.get();
 
         checkExpectedCreatedItemData(attachmentCreationResult, attachmentMap);
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml
index 03201bad30..67bf29a4f6 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/src/test/java/org/kie/kogito/index/inmemory/KogitoDevServiceTest.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/src/test/java/org/kie/kogito/index/inmemory/KogitoDevServiceTest.java
index 401ecbc1a0..dc48d88085 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/src/test/java/org/kie/kogito/index/inmemory/KogitoDevServiceTest.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/src/test/java/org/kie/kogito/index/inmemory/KogitoDevServiceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.inmemory;
 
 import java.time.Duration;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
index b560b385e6..4fc424a831 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties
index a6bb6880c5..3f50675a3d 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=filesystem
 kogito.service.url=http://localhost:8080
 
@@ -13,8 +32,8 @@ mp.messaging.outgoing.kogito-usertaskinstances-events.value.serializer=org.apach
 mp.messaging.outgoing.kogito-usertaskinstances-events.group.id=kogito-data-index-it
 mp.messaging.outgoing.kogito-usertaskinstances-events.auto.offset.reset=earliest
 
-mp.messaging.outgoing.kogito-variables-events.connector=smallrye-kafka
-mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events
-mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
-mp.messaging.outgoing.kogito-variables-events.group.id=kogito-data-index-it
-mp.messaging.outgoing.kogito-variables-events.auto.offset.reset=earliest
\ No newline at end of file
+mp.messaging.outgoing.kogito-processdefinitions-events.connector=smallrye-kafka
+mp.messaging.outgoing.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.outgoing.kogito-processdefinitions-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+mp.messaging.outgoing.kogito-processdefinitions-events.group.id=kogito-data-index-it
+mp.messaging.outgoing.kogito-processdefinitions-events.auto.offset.reset=earliest
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/AbstractProcessDataIndexInfinispanIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/AbstractProcessDataIndexInfinispanIT.java
index 8c7600f7bc..cb194469ab 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/AbstractProcessDataIndexInfinispanIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/AbstractProcessDataIndexInfinispanIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanHttpIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanHttpIT.java
index d49add93a9..3242b68df5 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanHttpIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanHttpIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanKafkaIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanKafkaIT.java
index 3fac4bfc58..8f6fc3be18 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanKafkaIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/infinispan/ProcessDataIndexInfinispanKafkaIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/inmemory/ProcessDataIndexInMemoryIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/inmemory/ProcessDataIndexInMemoryIT.java
index e30506e897..7069f251a2 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/inmemory/ProcessDataIndexInMemoryIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/inmemory/ProcessDataIndexInMemoryIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.inmemory;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/AbstractProcessDataIndexMongoDBIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/AbstractProcessDataIndexMongoDBIT.java
index da90def2db..064be8abd4 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/AbstractProcessDataIndexMongoDBIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/AbstractProcessDataIndexMongoDBIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.mongodb;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBHttpIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBHttpIT.java
index 7c4cfcfcc3..88b02e16e9 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBHttpIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBHttpIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.mongodb;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBKafkaIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBKafkaIT.java
index b15c96a599..ad7d8f04be 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBKafkaIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/mongodb/ProcessDataIndexMongoDBKafkaIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.mongodb;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java
index 1476650eed..fd5d48fccd 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.oracle;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java
index 9b6722c3b4..d323cbc6e0 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleHttpIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.oracle;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java
index 8d3283dd0f..bfcd0a7486 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/oracle/ProcessDataIndexOracleKafkaIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.oracle;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/AbstractProcessDataIndexPostgreSqlIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/AbstractProcessDataIndexPostgreSqlIT.java
index 14a62f35e1..d0e8c41a80 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/AbstractProcessDataIndexPostgreSqlIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/AbstractProcessDataIndexPostgreSqlIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlHttpIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlHttpIT.java
index 2a3dee9f9d..63ace7656f 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlHttpIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlHttpIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlKafkaIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlKafkaIT.java
index d057695930..15caa49253 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlKafkaIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/postgresql/ProcessDataIndexPostgreSqlKafkaIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/InMemoryTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/InMemoryTestProfile.java
index 152aa4b9ef..f8bebce87f 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/InMemoryTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/InMemoryTestProfile.java
@@ -1,26 +1,28 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.kie.kogito.index.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 import org.kie.kogito.index.test.quarkus.DataIndexInMemoryQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/InfinispanHttpTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/InfinispanHttpTestProfile.java
index 808b0d9f2f..1075212bf1 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/InfinispanHttpTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/InfinispanHttpTestProfile.java
@@ -1,25 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.http;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.kie.kogito.index.test.quarkus.http.DataIndexInfinispanHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/MongoDBHttpTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/MongoDBHttpTestProfile.java
index 478211d231..f48cb27b7e 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/MongoDBHttpTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/MongoDBHttpTestProfile.java
@@ -1,25 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.http;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.kie.kogito.index.test.quarkus.http.DataIndexMongoDBHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java
index 58674b31ab..e8bc357953 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java
@@ -1,25 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.http;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.kie.kogito.index.test.quarkus.http.DataIndexOracleHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/PostgreSqlHttpTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/PostgreSqlHttpTestProfile.java
index 8da0393cff..782e72ba3f 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/PostgreSqlHttpTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/PostgreSqlHttpTestProfile.java
@@ -1,25 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.http;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.kie.kogito.index.test.quarkus.http.DataIndexPostgreSqlHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/InfinispanKafkaTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/InfinispanKafkaTestProfile.java
index 2ad4df5b1a..a40ff5fe66 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/InfinispanKafkaTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/InfinispanKafkaTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.kafka;
 
 import java.util.Arrays;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
index 6165b9d458..98688a6fcd 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.quarkus.kafka;
 
@@ -47,8 +50,9 @@ protected Map<String, String> getProperties() {
         properties.put(QUARKUS_SERVICE_HTTP_PORT, String.valueOf(getTestResource().getMappedPort()));
         properties.put(KOGITO_SERVICE_URL, "http://host.testcontainers.internal:" + getTestResource().getMappedPort());
         properties.put("mp.messaging.outgoing.kogito-processinstances-events.connector", "smallrye-kafka");
+        properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.connector", "smallrye-kafka");
         properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.connector", "smallrye-kafka");
-        properties.put("mp.messaging.outgoing.kogito-variables-events.connector", "smallrye-kafka");
+        properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.connector", "smallrye-kafka");
 
         return properties;
     }
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/MongoDBKafkaTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/MongoDBKafkaTestProfile.java
index 36e307f944..a0c2c8493b 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/MongoDBKafkaTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/MongoDBKafkaTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.kafka;
 
 import java.util.Arrays;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java
index a8f3ba1d45..4e129fb0f0 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.kafka;
 
 import java.util.Arrays;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/PostgreSqlKafkaTestProfile.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/PostgreSqlKafkaTestProfile.java
index b6b2d7531b..0bbb98ce7c 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/PostgreSqlKafkaTestProfile.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/PostgreSqlKafkaTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.quarkus.kafka;
 
 import java.util.Arrays;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties
index 0829044d79..5521cae262 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Quarkus
 quarkus.log.console.enable=true
 quarkus.log.console.level=INFO
@@ -10,13 +29,13 @@ mp.messaging.outgoing.kogito-processinstances-events.connector=smallrye-kafka
 mp.messaging.outgoing.kogito-processinstances-events.topic=kogito-processinstances-events
 mp.messaging.outgoing.kogito-processinstances-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
 
+mp.messaging.outgoing.kogito-processdefinitions-events.connector=smallrye-kafka
+mp.messaging.outgoing.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.outgoing.kogito-processdefinitions-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+
 mp.messaging.outgoing.kogito-usertaskinstances-events.connector=smallrye-kafka
 mp.messaging.outgoing.kogito-usertaskinstances-events.topic=kogito-usertaskinstances-events
 mp.messaging.outgoing.kogito-usertaskinstances-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
 
-mp.messaging.outgoing.kogito-variables-events.connector=smallrye-kafka
-mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events
-mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
-
 quarkus.http.auth.permission.source-files-addon.paths=/management/*
 quarkus.http.auth.permission.source-files-addon.policy=permit
\ No newline at end of file
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
index 44a8edd1cd..fe40940221 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
index d5bd9e790f..ffce47714a 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/application.properties
index 108616e114..a4856961d3 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=filesystem
 spring.kafka.consumer.group-id=kogito-data-index-it
 spring.kafka.consumer.auto-offset-reset=earliest
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
index 0a51b94fad..49e9d2a878 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
index a7308ac7bd..492153321a 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
index 8c6ef976a0..0b760e7091 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
index d514f13d01..def1ece2aa 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexInfinispanSpringTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexInfinispanSpringTestResource.java
index d1301e5374..5168678287 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexInfinispanSpringTestResource.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexInfinispanSpringTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.spring;
 
 import java.util.HashMap;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexMongoDBSpringTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexMongoDBSpringTestResource.java
index ce22c550f0..8ec213cc81 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexMongoDBSpringTestResource.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexMongoDBSpringTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.spring;
 
 import java.util.HashMap;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java
index c96fc04c73..fd8d1ef41c 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexOracleSpringTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.spring;
 
 import java.util.HashMap;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java
index 39d82bfbc2..f6b07272e6 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.spring;
 
 import java.util.HashMap;
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/KogitoServiceRandomPortSpringTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/KogitoServiceRandomPortSpringTestResource.java
index 59e6202539..fb9cfc74c3 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/KogitoServiceRandomPortSpringTestResource.java
+++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/KogitoServiceRandomPortSpringTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.spring;
 
diff --git a/apps-integration-tests/integration-tests-data-index-service/pom.xml b/apps-integration-tests/integration-tests-data-index-service/pom.xml
index 3ac3877f8d..839b4f8201 100644
--- a/apps-integration-tests/integration-tests-data-index-service/pom.xml
+++ b/apps-integration-tests/integration-tests-data-index-service/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/pom.xml
index 958e0ce826..2c8a488303 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/AbstractHelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/AbstractHelloService.java
index e493223374..1c41f758dc 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/AbstractHelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/AbstractHelloService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesIT.java
index 217ea2fdfd..b4d432a097 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.junit.jupiter.api.Test;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessAsyncIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessAsyncIT.java
index bc6c291394..4651900e48 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessAsyncIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessAsyncIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessTimerIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessTimerIT.java
index fbf30b06ed..4ab10943e5 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessTimerIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/BaseProcessTimerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/JobServiceHealthAware.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/JobServiceHealthAware.java
index 23402b6da6..dcbc588971 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/JobServiceHealthAware.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/it/jobs/JobServiceHealthAware.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/TestUtils.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/TestUtils.java
index 2fa35241f3..c970667951 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/TestUtils.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/TestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.test;
 
 import java.time.Duration;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
index 7686bb5a1b..802896bb4b 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.test.resources;
 
 import java.text.MessageFormat;
@@ -27,6 +29,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoGenericContainer;
 import org.kie.kogito.testcontainers.KogitoKafkaContainer;
 import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
@@ -92,7 +95,7 @@ public void start() {
         final Network network = Network.newNetwork();
         sharedDependencyContainers.values().stream()
                 .map(c -> c.withNetwork(network))
-                .map(c -> c.waitingFor(Wait.forListeningPort()))
+                .map(c -> c.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT))
                 .forEach(GenericContainer::start);
         configureKafkaToService(sharedDependencyContainers.values(), serviceContainers.values().toArray(GenericContainer[]::new));
         startServices(network);
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortTestResource.java
index 6f466da1d0..ca82f30e96 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortTestResource.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.test.resources;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
index 77841a9db3..9781a04b47 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.testcontainers;
 
@@ -26,7 +29,7 @@ public class JobServiceContainer extends KogitoGenericContainer<JobServiceContai
     public JobServiceContainer() {
         super(NAME);
         addExposedPort(PORT);
-        waitingFor(Wait.forHttp("/q/health/live").forStatusCode(200));
+        waitingFor(Wait.forHttp("/q/health/live").forStatusCode(200)).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         addEnv("QUARKUS_HTTP_PORT", Integer.toString(PORT));
         addEnv("QUARKUS_LOG_CATEGORY__ORG_KIE_KOGITO_JOBS_SERVICE__LEVEL", "DEBUG");
         withAccessToHost(true);
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/pom.xml
index 013d72c2b9..dd4f221c5a 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java
index 881b00b9bb..8b4eee8991 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.test.resources;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceTestResource.java
index c8fa913afc..852e4e488e 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceTestResource.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.test.resources;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortQuarkusTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortQuarkusTestResource.java
index f24ff3cf47..0ab467e293 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortQuarkusTestResource.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/KogitoServiceRandomPortQuarkusTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.test.resources;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseCallbackStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseCallbackStateTimeoutsIT.java
index 864d2d9e82..dc5480e592 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseCallbackStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseCallbackStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.junit.jupiter.api.Test;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesQuarkusIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesQuarkusIT.java
index b6e5efd783..da7631a4bd 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesQuarkusIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseMultipleTimerInstancesQuarkusIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.junit.jupiter.api.Test;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseSwitchStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseSwitchStateTimeoutsIT.java
index 0e0ee8e092..33034f65fa 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseSwitchStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseSwitchStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.junit.jupiter.api.Test;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseWorkflowTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseWorkflowTimeoutsIT.java
index a49ee424f1..bfe00d5632 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseWorkflowTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/BaseWorkflowTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.junit.jupiter.api.Test;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/JobServiceLeaderIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/JobServiceLeaderIT.java
index f31a967665..069a5c3fa7 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/JobServiceLeaderIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/JobServiceLeaderIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/KafkaBaseSwitchStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/KafkaBaseSwitchStateTimeoutsIT.java
index 3836a74689..6e36d1a2cb 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/KafkaBaseSwitchStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/test/java/org/kie/kogito/it/jobs/KafkaBaseSwitchStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.eclipse.microprofile.config.ConfigProvider;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
index 029a1eb7e5..c00d7e5c82 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
index a2f165965b..6363355d04 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/resources/application.properties
index b3fbeadd44..c3f997dc10 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.log.category."org.kie.kogito.jobs.management.quarkus".level=DEBUG
 
 quarkus.kafka.devservices.enabled=true
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
index 317d0db2c8..40dfbef40d 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
index 632c22db4b..6e648993fd 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
index beafd532ec..e95eab8881 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
index 2ac54e4c07..aae46ece59 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
index b1bf1992d5..dad71eaecd 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
index 5372ea2bcb..555af5c9fa 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
index 2800114544..d13d21d7fd 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
index b42d5fa5ec..6363355d04 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties
index 64f1b8f0d4..c5b50e5220 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties
@@ -1,8 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.service.url=http://localhost:8080
 
 # Disable the KSinkInjectionHealthCheck since the K_SINK env variable is not passed in this context.
 quarkus.smallrye-health.check."org.kie.kogito.addons.quarkus.knative.eventing.KSinkInjectionHealthCheck".enabled=false
 
+quarkus.kafka.devservices.enabled=false
 quarkus.kogito.devservices.enabled=false
 
 # Events produced by kogito-addons-quarkus-jobs-knative-eventing to program the timers on the jobs service.
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
index 3519140d0d..aa553b6e85 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
index 5207f1e0db..b56367f66e 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
index e9c281d9fc..b3ed2397d9 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
index cff73a99d6..77d4ec61cb 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SinkMock.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SinkMock.java
index fd9523acfa..3252478904 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SinkMock.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SinkMock.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import java.util.Collections;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
index f9ba5cf1cf..8d04406264 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
index cc42f9c977..3b59ec3d28 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
index 31ce53558b..d39b850942 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
index 065d0dcfc3..6363355d04 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties
index 8266faec56..8d35e2fecd 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.service.url=http://localhost:8080
 
 quarkus.log.category."org.kie.kogito.jobs.management.quarkus".level=DEBUG
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
index 6614c03018..481672c4db 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
index edd25c6055..cb6b50cf29 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
index 8bd3b4c241..e257c491f7 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
index 35d7e5fbcc..96a354e5d3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
index 53604cb1f0..a57b9264bc 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
index 9ed0467087..99dd8ee0dd 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
index 38f3d18789..bafe0c0e40 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
index 065d0dcfc3..6363355d04 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
index 96298ca1f4..b215aedc6c 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.service.url=http://localhost:8080
 
 quarkus.log.category."org.kie.kogito.jobs.messaging.quarkus".level=DEBUG
@@ -43,6 +62,10 @@ mp.messaging.outgoing.kogito-variables-events.connector=smallrye-kafka
 mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events
 mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
 
+mp.messaging.outgoing.kogito-processdefinitions-events.connector=smallrye-kafka
+mp.messaging.outgoing.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.outgoing.kogito-processdefinitions-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+
 kogito.persistence.type=filesystem
 
-quarkus.devservices.enabled=false
\ No newline at end of file
+quarkus.devservices.enabled=false
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
index 3592fa917c..8e3b5e4d19 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/CallbackStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
index c5216a2f3a..c86aaaeb93 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
index 556dbe30f1..0a3c03de9d 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
index 24325f5a29..bc99e26e8b 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
index 5e6f52abc1..d4426a0592 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/SwitchStateTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
index cf3c0e992e..8a3fb0e57a 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/test/java/org/kie/kogito/it/jobs/WorkflowTimeoutsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.kie.kogito.test.resources.JobServiceTestResource;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml
index a013792ac4..9c65357577 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml
index 2ac7dea916..01898d003e 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/HelloService.java
index ffeec5bbb0..840160cbe3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/HelloService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
index 8fe7a5bb5c..614f76caef 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
index 3f9c08bc1f..f764acdeee 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/MultipleTimerInstancesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.jobs;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
index b9bb543d7f..08bb6a8982 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessAsyncIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
index 14a0a7a789..8dcea71510 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/it/jobs/ProcessTimerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.jobs;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/JobServiceSpringBootTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/JobServiceSpringBootTestResource.java
index 6e03486eb9..bc2160d713 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/JobServiceSpringBootTestResource.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/JobServiceSpringBootTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.test.resources;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/KogitoServiceRandomPortSpringBootTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/KogitoServiceRandomPortSpringBootTestResource.java
index 3e152d704e..d68747b249 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/KogitoServiceRandomPortSpringBootTestResource.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/java/org/kie/kogito/test/resources/KogitoServiceRandomPortSpringBootTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.test.resources;
 
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/resources/application.properties b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/resources/application.properties
index c066f97e26..7b44d0c551 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/resources/application.properties
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/src/test/resources/application.properties
@@ -1,17 +1,20 @@
-##
-#  Copyright 2020 Red Hat, Inc. and/or its affiliates.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-#        http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Runtime Configuration #
diff --git a/apps-integration-tests/integration-tests-jobs-service/pom.xml b/apps-integration-tests/integration-tests-jobs-service/pom.xml
index 4872c9dd79..e0474d4bad 100644
--- a/apps-integration-tests/integration-tests-jobs-service/pom.xml
+++ b/apps-integration-tests/integration-tests-jobs-service/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
diff --git a/apps-integration-tests/integration-tests-trusty-audit/pom.xml b/apps-integration-tests/integration-tests-trusty-audit/pom.xml
index d3a8a52806..feeff4ef7e 100644
--- a/apps-integration-tests/integration-tests-trusty-audit/pom.xml
+++ b/apps-integration-tests/integration-tests-trusty-audit/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
diff --git a/apps-integration-tests/integration-tests-trusty-audit/src/test/resources/infinispan/infinispan.xml b/apps-integration-tests/integration-tests-trusty-audit/src/test/resources/infinispan/infinispan.xml
index f9a70ec290..1201a8dc47 100644
--- a/apps-integration-tests/integration-tests-trusty-audit/src/test/resources/infinispan/infinispan.xml
+++ b/apps-integration-tests/integration-tests-trusty-audit/src/test/resources/infinispan/infinispan.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <infinispan>
     <cache-container name="default"/>
     <server>
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml
index 178bf8ccba..2039550765 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java
index 1cbbdce0c1..4207ff9ae6 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.it.trusty;
 
 import java.util.ArrayList;
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java
index 9fbbc2ce09..0502d26c97 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/ExplainabilityServiceMessagingContainer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.testcontainers;
 
@@ -24,6 +27,6 @@ public ExplainabilityServiceMessagingContainer(String kafkaBootstrapServers, int
         addEnv("KAFKA_BOOTSTRAP_SERVERS", kafkaBootstrapServers);
         addEnv("TRUSTY_EXPLAINABILITY_NUMBEROFSAMPLES", String.valueOf(numberOfSamples));
         addExposedPort(8080);
-        waitingFor(Wait.forListeningPort());
+        waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
     }
 }
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java
index a8c7dd8e9d..5e92b2b154 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/InfinispanTrustyServiceContainer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.testcontainers;
 
@@ -26,6 +29,6 @@ public InfinispanTrustyServiceContainer(String infinispanServerList, String kafk
         addEnv("KAFKA_BOOTSTRAP_SERVERS", kafkaBootstrapServer);
         addEnv("TRUSTY_EXPLAINABILITY_ENABLED", String.valueOf(explainabilityEnabled));
         addExposedPort(8080);
-        waitingFor(Wait.forListeningPort());
+        waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
     }
 }
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/KogitoServiceContainer.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/KogitoServiceContainer.java
index 0b2eac4187..161d6e4296 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/KogitoServiceContainer.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/testcontainers/KogitoServiceContainer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.testcontainers;
 
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml
index fe308cab43..00be09b2f6 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/main/resources/application.properties b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/main/resources/application.properties
index a80601281c..7ac9937d39 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Container image
 quarkus.container-image.build=${quarkus.build.image:true}
 quarkus.container-image.group=org.kie.kogito
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
index ecce9235e3..155e810a6c 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.trusty;
 
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/QuarkusTrustyExplainabilityEnd2EndIT.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/QuarkusTrustyExplainabilityEnd2EndIT.java
index d5294d7fa6..a664ed8bde 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/QuarkusTrustyExplainabilityEnd2EndIT.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/QuarkusTrustyExplainabilityEnd2EndIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.trusty;
 
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java
index dd330b855a..68e546e2a5 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/testcontainers/QuarkusKogitoServiceContainer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.testcontainers;
 
@@ -22,6 +25,6 @@ public class QuarkusKogitoServiceContainer extends KogitoServiceContainer {
     public QuarkusKogitoServiceContainer(String kafkaBootstrapServer, String kogitoServiceUrl) {
         super(kogitoServiceUrl);
         addEnv("KAFKA_BOOTSTRAP_SERVERS", kafkaBootstrapServer);
-        waitingFor(Wait.forListeningPort());
+        waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
     }
 }
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
index c86d0a4e71..4dc2971fb6 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
index 8041663c9b..6c1a30c551 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/java/org/kie/kogito/KogitoApplication.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito;
 
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/resources/application.properties b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/resources/application.properties
index 726c1ef37e..2db689ca70 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/resources/application.properties
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 server.address=0.0.0.0
 spring.kafka.consumer.group-id=kogito-trusty
 spring.kafka.consumer.auto-offset-reset=earliest
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/it/trusty/SpringBootTrustyExplainabilityEnd2EndIT.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/it/trusty/SpringBootTrustyExplainabilityEnd2EndIT.java
index d67db2d687..4e019354c4 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/it/trusty/SpringBootTrustyExplainabilityEnd2EndIT.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/it/trusty/SpringBootTrustyExplainabilityEnd2EndIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.it.trusty;
 
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java
index 0529cde44d..a302c98a9d 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/src/test/java/org/kie/kogito/testcontainers/SpringBootKogitoServiceContainer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.testcontainers;
 
@@ -22,6 +25,6 @@ public class SpringBootKogitoServiceContainer extends KogitoServiceContainer {
     public SpringBootKogitoServiceContainer(String kafkaBootstrapServer, String kogitoServiceUrl) {
         super(kogitoServiceUrl);
         addEnv("KOGITO_ADDON_TRACING_DECISION_KAFKA_BOOTSTRAPADDRESS", kafkaBootstrapServer);
-        waitingFor(Wait.forLogMessage(".*Started KogitoApplication in.*", 1));
+        waitingFor(Wait.forLogMessage(".*Started KogitoApplication in.*", 1)).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
     }
 }
diff --git a/apps-integration-tests/integration-tests-trusty-service/pom.xml b/apps-integration-tests/integration-tests-trusty-service/pom.xml
index ab2ba92c76..2956189499 100644
--- a/apps-integration-tests/integration-tests-trusty-service/pom.xml
+++ b/apps-integration-tests/integration-tests-trusty-service/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
diff --git a/apps-integration-tests/pom.xml b/apps-integration-tests/pom.xml
index 65bd8956ad..9512af458e 100644
--- a/apps-integration-tests/pom.xml
+++ b/apps-integration-tests/pom.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
diff --git a/data-index/data-index-common/pom.xml b/data-index/data-index-common/pom.xml
index b744de0205..f25994ad6e 100644
--- a/data-index/data-index-common/pom.xml
+++ b/data-index/data-index-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -25,10 +45,26 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-fault-tolerance</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-vertx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-web-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-oidc</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/DateTimeUtils.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/DateTimeUtils.java
index 51fcdcd304..294d85c3bb 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/DateTimeUtils.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/DateTimeUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index;
 
 import java.time.LocalDateTime;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java
index 40d02f690c..50b94365ee 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.api;
 
 import java.util.List;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
new file mode 100644
index 0000000000..11291f6aeb
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.api;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.kie.kogito.index.model.Job;
+import org.kie.kogito.index.service.DataIndexServiceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.quarkus.security.credential.TokenCredential;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.client.HttpResponse;
+import io.vertx.ext.web.client.WebClient;
+import io.vertx.ext.web.client.WebClientOptions;
+
+import static java.lang.String.format;
+
+@ApplicationScoped
+public class KogitoRuntimeCommonClient {
+
+    public static final String CANCEL_JOB_PATH = "/jobs/%s";
+    public static final String RESCHEDULE_JOB_PATH = "/jobs/%s";
+
+    public static final String FROM_PROCESS_INSTANCE_WITH_ID = "from ProcessInstance with id: ";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(KogitoRuntimeCommonClient.class);
+
+    protected Vertx vertx;
+
+    protected SecurityIdentity identity;
+
+    protected Map<String, WebClient> serviceWebClientMap = new HashMap<>();
+
+    @ConfigProperty(name = "kogito.dataindex.gateway.url")
+    protected Optional<String> gatewayTargetUrl;
+
+    public void setGatewayTargetUrl(Optional<String> gatewayTargetUrl) {
+        this.gatewayTargetUrl = gatewayTargetUrl;
+    }
+
+    public void addServiceWebClient(String serviceUrl, WebClient webClient) {
+        serviceWebClientMap.put(serviceUrl, webClient);
+    }
+
+    protected WebClient getWebClient(String runtimeServiceUrl) {
+        if (runtimeServiceUrl == null) {
+            throw new DataIndexServiceException("Runtime service URL not defined, please review the kogito.service.url system property to point the public URL for this runtime.");
+        } else {
+            return serviceWebClientMap.computeIfAbsent(runtimeServiceUrl, url -> WebClient.create(vertx, getWebClientToURLOptions(runtimeServiceUrl)));
+        }
+    }
+
+    public WebClientOptions getWebClientToURLOptions(String targetHttpURL) {
+        try {
+            URL dataIndexURL = new URL(targetHttpURL);
+            return new WebClientOptions()
+                    .setDefaultHost(gatewayTargetUrl.orElse(dataIndexURL.getHost()))
+                    .setDefaultPort((dataIndexURL.getPort() != -1 ? dataIndexURL.getPort() : dataIndexURL.getDefaultPort()))
+                    .setSsl(dataIndexURL.getProtocol().compareToIgnoreCase("https") == 0);
+        } catch (MalformedURLException ex) {
+            LOGGER.error(String.format("Invalid runtime service URL: %s", targetHttpURL), ex);
+            return null;
+        }
+    }
+
+    public CompletableFuture<String> cancelJob(String serviceURL, Job job) {
+        String requestURI = format(CANCEL_JOB_PATH, job.getId());
+        LOGGER.debug("Sending DELETE to URI {}", requestURI);
+        return sendDeleteClientRequest(getWebClient(serviceURL), requestURI, "CANCEL Job with id: " + job.getId());
+    }
+
+    public CompletableFuture<String> rescheduleJob(String serviceURL, Job job, String newJobData) {
+        String requestURI = format(RESCHEDULE_JOB_PATH, job.getId());
+        LOGGER.debug("Sending body: {} PATCH to URI {}", newJobData, requestURI);
+        return sendPatchClientRequest(getWebClient(serviceURL), requestURI,
+                "RESCHEDULED JOB with id: " + job.getId(), new JsonObject(newJobData));
+    }
+
+    public CompletableFuture sendDeleteClientRequest(WebClient webClient, String requestURI, String logMessage) {
+        CompletableFuture future = new CompletableFuture<>();
+        webClient.delete(requestURI)
+                .putHeader("Authorization", getAuthHeader())
+                .send(res -> asyncHttpResponseTreatment(res, future, logMessage));
+        LOGGER.debug("Sending DELETE to URI {}", requestURI);
+        return future;
+    }
+
+    protected void asyncHttpResponseTreatment(AsyncResult<HttpResponse<Buffer>> res, CompletableFuture future, String logMessage) {
+        if (res.succeeded() && (res.result().statusCode() == 200 || res.result().statusCode() == 201)) {
+            future.complete(res.result().bodyAsString() != null ? res.result().bodyAsString() : "Successfully performed: " + logMessage);
+        } else {
+            future.completeExceptionally(new DataIndexServiceException(getErrorMessage(logMessage, res.result())));
+        }
+    }
+
+    public CompletableFuture sendPatchClientRequest(WebClient webClient, String requestURI, String logMessage, JsonObject jsonBody) {
+        CompletableFuture future = new CompletableFuture<>();
+        webClient.patch(requestURI)
+                .putHeader("Authorization", getAuthHeader())
+                .sendJson(jsonBody, res -> asyncHttpResponseTreatment(res, future, logMessage));
+        return future;
+    }
+
+    protected String getErrorMessage(String logMessage, HttpResponse<Buffer> result) {
+        String errorMessage = "FAILED: " + logMessage;
+        if (result != null) {
+            errorMessage += " errorCode:" + result.statusCode() +
+                    " errorStatus:" + result.statusMessage() +
+                    " errorMessage:" + (result.body() != null ? result.body().toString() : "-");
+        }
+        return errorMessage;
+    }
+
+    public String getAuthHeader() {
+        if (identity != null && identity.getCredential(TokenCredential.class) != null) {
+            return "Bearer " + identity.getCredential(TokenCredential.class).getToken();
+        }
+        return "";
+    }
+
+    @Inject
+    public void setIdentity(SecurityIdentity identity) {
+        this.identity = identity;
+    }
+
+    @Inject
+    public void setVertx(Vertx vertx) {
+        this.vertx = vertx;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/AbstractBuilder.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/AbstractBuilder.java
index 6c714dafe7..5d99a7d8fe 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/AbstractBuilder.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/AbstractBuilder.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.event;
 
 import java.net.URI;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoCloudEvent.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoCloudEvent.java
index cf2d6de990..cad657ebe8 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoCloudEvent.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoCloudEvent.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.event;
 
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoJobCloudEvent.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoJobCloudEvent.java
index 00f7bbc2b5..c3419c44ba 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoJobCloudEvent.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/KogitoJobCloudEvent.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.event;
 
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/ProcessInstanceEventMapper.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/ProcessInstanceEventMapper.java
deleted file mode 100644
index 01b70c56a2..0000000000
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/ProcessInstanceEventMapper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.kie.kogito.index.event;
-
-import java.util.Set;
-import java.util.function.Function;
-
-import org.kie.kogito.event.process.MilestoneEventBody;
-import org.kie.kogito.event.process.NodeInstanceEventBody;
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.index.model.Milestone;
-import org.kie.kogito.index.model.NodeInstance;
-import org.kie.kogito.index.model.ProcessDefinition;
-import org.kie.kogito.index.model.ProcessInstance;
-import org.kie.kogito.index.model.ProcessInstanceError;
-
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static java.util.stream.Collectors.toList;
-import static org.kie.kogito.index.DateTimeUtils.toZonedDateTime;
-import static org.kie.kogito.index.json.JsonUtils.getObjectMapper;
-
-public class ProcessInstanceEventMapper implements Function<ProcessInstanceDataEvent, ProcessInstance> {
-
-    @Override
-    public ProcessInstance apply(ProcessInstanceDataEvent event) {
-        if (event == null || event.getData() == null) {
-            return null;
-        }
-
-        ProcessInstance pi = new ProcessInstance();
-        pi.setId(event.getData().getId());
-        pi.setProcessId(event.getData().getProcessId());
-        pi.setProcessName(event.getData().getProcessName());
-        pi.setRootProcessInstanceId(event.getData().getRootInstanceId());
-        pi.setRootProcessId(event.getData().getRootProcessId());
-        pi.setParentProcessInstanceId(event.getData().getParentInstanceId());
-        pi.setRoles(event.getData().getRoles());
-        pi.setVariables(getObjectMapper().valueToTree(event.getData().getVariables()));
-        pi.setNodes(event.getData().getNodeInstances().stream().map(nodeInstance()).collect(toList()));
-        pi.setState(event.getData().getState());
-        pi.setStart(toZonedDateTime(event.getData().getStartDate()));
-        pi.setEnd(toZonedDateTime(event.getData().getEndDate()));
-        if (event.getData().getError() != null) {
-            pi.setError(new ProcessInstanceError(event.getData().getError().getNodeDefinitionId(), event.getData().getError().getErrorMessage()));
-        }
-        pi.setMilestones(event.getData().getMilestones().stream().map(milestone()).collect(toList()));
-        pi.setBusinessKey(event.getData().getBusinessKey());
-        pi.setAddons(isNullOrEmpty(event.getKogitoAddons()) ? null : Set.of(event.getKogitoAddons().split(",")));
-        pi.setEndpoint(event.getSource() == null ? null : event.getSource().toString());
-        pi.setLastUpdate(toZonedDateTime(event.getTime()));
-        pi.setVersion(event.getData().getVersion());
-        pi.setDefinition(definition().apply(event));
-        pi.setUpdatedBy(event.getData().getIdentity());
-        return pi;
-    }
-
-    private Function<ProcessInstanceDataEvent, ProcessDefinition> definition() {
-        return event -> {
-            ProcessDefinition pd = new ProcessDefinition();
-            pd.setId(event.getData().getProcessId());
-            pd.setName(event.getData().getProcessName());
-            pd.setVersion(event.getData().getVersion());
-            pd.setAddons(isNullOrEmpty(event.getKogitoAddons()) ? null : Set.of(event.getKogitoAddons().split(",")));
-            pd.setRoles(event.getData().getRoles());
-            pd.setType(event.getKogitoProcessType());
-            pd.setEndpoint(event.getSource() == null ? null : event.getSource().toString());
-            return pd;
-        };
-    }
-
-    private Function<NodeInstanceEventBody, NodeInstance> nodeInstance() {
-        return nib -> {
-            NodeInstance ni = new NodeInstance();
-            ni.setId(nib.getId());
-            ni.setEnter(toZonedDateTime(nib.getTriggerTime()));
-            ni.setName(nib.getNodeName());
-            ni.setType(nib.getNodeType());
-            ni.setNodeId(nib.getNodeId());
-            ni.setDefinitionId(nib.getNodeDefinitionId());
-            ni.setExit(toZonedDateTime(nib.getLeaveTime()));
-            return ni;
-        };
-    }
-
-    private Function<MilestoneEventBody, Milestone> milestone() {
-        return m -> Milestone.builder()
-                .id(m.getId())
-                .name(m.getName())
-                .status(m.getStatus())
-                .build();
-    }
-}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/UserTaskInstanceEventMapper.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/UserTaskInstanceEventMapper.java
deleted file mode 100644
index ce9908b85a..0000000000
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/UserTaskInstanceEventMapper.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.kie.kogito.index.event;
-
-import java.net.URI;
-import java.util.function.Function;
-
-import org.kie.kogito.event.process.AttachmentEventBody;
-import org.kie.kogito.event.process.CommentEventBody;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
-import org.kie.kogito.index.model.Attachment;
-import org.kie.kogito.index.model.Comment;
-import org.kie.kogito.index.model.UserTaskInstance;
-
-import com.google.common.net.UrlEscapers;
-
-import static java.lang.String.format;
-import static java.util.stream.Collectors.toList;
-import static org.kie.kogito.index.DateTimeUtils.toZonedDateTime;
-import static org.kie.kogito.index.json.JsonUtils.getObjectMapper;
-
-public class UserTaskInstanceEventMapper implements Function<UserTaskInstanceDataEvent, UserTaskInstance> {
-
-    @Override
-    public UserTaskInstance apply(UserTaskInstanceDataEvent event) {
-        if (event == null || event.getData() == null) {
-            return null;
-        }
-
-        UserTaskInstance task = new UserTaskInstance();
-        task.setId(event.getData().getId());
-        task.setProcessInstanceId(event.getData().getProcessInstanceId());
-        task.setProcessId(event.getData().getProcessId());
-        task.setRootProcessId(event.getData().getRootProcessId());
-        task.setRootProcessInstanceId(event.getData().getRootProcessInstanceId());
-        task.setName(event.getData().getTaskName());
-        task.setDescription(event.getData().getTaskDescription());
-        task.setState(event.getData().getState());
-        task.setPriority(event.getData().getTaskPriority());
-        task.setStarted(toZonedDateTime(event.getData().getStartDate()));
-        task.setCompleted(toZonedDateTime(event.getData().getCompleteDate()));
-        task.setActualOwner(event.getData().getActualOwner());
-        task.setAdminUsers(event.getData().getAdminUsers());
-        task.setAdminGroups(event.getData().getAdminGroups());
-        task.setExcludedUsers(event.getData().getExcludedUsers());
-        task.setPotentialUsers(event.getData().getPotentialUsers());
-        task.setPotentialGroups(event.getData().getPotentialGroups());
-        task.setComments(event.getData().getComments().stream().map(comment()).collect(toList()));
-        task.setAttachments(event.getData().getAttachments().stream().map(attachment()).collect(toList()));
-        task.setInputs(getObjectMapper().valueToTree(event.getData().getInputs()));
-        task.setOutputs(getObjectMapper().valueToTree(event.getData().getOutputs()));
-        task.setEndpoint(event.getSource() == null ? null : getEndpoint(event.getSource(), event.getData().getProcessInstanceId(), event.getData().getTaskName(), event.getData().getId()));
-        task.setLastUpdate(toZonedDateTime(event.getTime()));
-        task.setReferenceName(event.getData().getReferenceName());
-        return task;
-    }
-
-    private Function<CommentEventBody, Comment> comment() {
-        return c -> Comment.builder()
-                .id(c.getId())
-                .content(c.getContent())
-                .updatedBy(c.getUpdatedBy())
-                .updatedAt(toZonedDateTime(c.getUpdatedAt()))
-                .build();
-    }
-
-    private Function<AttachmentEventBody, Attachment> attachment() {
-        return a -> Attachment.builder()
-                .id(a.getId())
-                .content(a.getContent() == null ? null : a.getContent().toString())
-                .name(a.getName())
-                .updatedBy(a.getUpdatedBy())
-                .updatedAt(toZonedDateTime(a.getUpdatedAt()))
-                .build();
-    }
-
-    public String getEndpoint(URI source, String pId, String taskName, String taskId) {
-        String name = UrlEscapers.urlPathSegmentEscaper().escape(taskName);
-        return source.toString() + format("/%s/%s/%s", pId, name, taskId);
-    }
-}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/Merger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/Merger.java
new file mode 100644
index 0000000000..0f685661ed
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/Merger.java
@@ -0,0 +1,7 @@
+package org.kie.kogito.index.event.mapper;
+
+public interface Merger<I, R> {
+    boolean accept(Object input);
+
+    R merge(R instance, I input);
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessDefinitionDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessDefinitionDataEventMerger.java
new file mode 100644
index 0000000000..3b5ab8e6ac
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessDefinitionDataEventMerger.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.process.NodeDefinition;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionEventBody;
+import org.kie.kogito.index.json.JsonUtils;
+import org.kie.kogito.index.model.Node;
+import org.kie.kogito.index.model.ProcessDefinition;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import static java.util.stream.Collectors.toList;
+
+@ApplicationScoped
+public class ProcessDefinitionDataEventMerger implements ProcessDefinitionEventMerger {
+    @Override
+    public boolean accept(Object input) {
+        return input != null && input instanceof ProcessDefinitionDataEvent;
+    }
+
+    @Override
+    public ProcessDefinition merge(ProcessDefinition instance, ProcessDefinitionDataEvent event) {
+        ProcessDefinitionEventBody data = event.getData();
+        if (event == null || data == null) {
+            return instance;
+        }
+        if (instance == null) {
+            instance = new ProcessDefinition();
+        }
+        instance.setId(doMerge(data.getId(), instance.getId()));
+        instance.setName(doMerge(data.getName(), instance.getName()));
+        instance.setVersion(doMerge(data.getVersion(), instance.getVersion()));
+        instance.setAddons(doMerge(data.getAddons(), instance.getAddons()));
+        instance.setRoles(doMerge(data.getRoles(), instance.getRoles()));
+        instance.setType(doMerge(data.getType(), instance.getType()));
+        instance.setEndpoint(doMerge(data.getEndpoint(), instance.getEndpoint()));
+        instance.setDescription(doMerge(data.getDescription(), instance.getDescription()));
+        instance.setAnnotations(doMerge(data.getAnnotations(), instance.getAnnotations()));
+        instance.setMetadata(doMerge(toStringMap(data.getMetadata()), instance.getMetadata()));
+        instance.setNodes(doMerge(nodeDefinitions(data), instance.getNodes()));
+        return instance;
+    }
+
+    private List<Node> nodeDefinitions(ProcessDefinitionEventBody data) {
+        if (data.getNodes() == null && data.getNodes().isEmpty()) {
+            return Collections.emptyList();
+        }
+        return data.getNodes().stream().map(this::nodeDefinition).collect(toList());
+    }
+
+    private Node nodeDefinition(NodeDefinition definition) {
+        Node node = new Node();
+        node.setId(definition.getId());
+        node.setName(definition.getName());
+        node.setUniqueId(definition.getUniqueId());
+        node.setType(definition.getType());
+        node.setMetadata(toStringMap(definition.getMetadata()));
+        return node;
+    }
+
+    private <T> T doMerge(T incoming, T current) {
+        boolean notEmpty = (incoming instanceof Collection) ? !((Collection) incoming).isEmpty() : incoming != null;
+        boolean notEquals = !Objects.deepEquals(incoming, current);
+        if (notEmpty && notEquals) {
+            return incoming;
+        }
+        return current;
+    }
+
+    public static Map<String, String> toStringMap(Map<String, ?> input) {
+        if (input == null) {
+            return null;
+        }
+        return input.entrySet().stream()
+                .map(entry -> {
+                    if (String.class.isInstance(entry.getValue())) {
+                        return entry;
+                    }
+                    String value = null;
+                    try {
+                        value = JsonUtils.getObjectMapper().writeValueAsString(entry.getValue());
+                    } catch (JsonProcessingException e) {
+                        throw new RuntimeException(e);
+                    }
+                    return new AbstractMap.SimpleEntry<>(entry.getKey(), value);
+                }).collect(Collectors.toMap(Map.Entry::getKey, e -> (String) e.getValue()));
+    }
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessDefinitionEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessDefinitionEventMerger.java
new file mode 100644
index 0000000000..0e38d838ac
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessDefinitionEventMerger.java
@@ -0,0 +1,7 @@
+package org.kie.kogito.index.event.mapper;
+
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
+import org.kie.kogito.index.model.ProcessDefinition;
+
+public interface ProcessDefinitionEventMerger extends Merger<ProcessDefinitionDataEvent, ProcessDefinition> {
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
new file mode 100644
index 0000000000..5c8cd13103
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+import org.kie.kogito.index.model.ProcessInstance;
+import org.kie.kogito.index.model.ProcessInstanceError;
+
+@ApplicationScoped
+public class ProcessInstanceErrorDataEventMerger implements ProcessInstanceEventMerger {
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof ProcessInstanceErrorDataEvent;
+    }
+
+    @Override
+    public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> data) {
+        pi = getOrNew(pi, data);
+        ProcessInstanceErrorDataEvent event = (ProcessInstanceErrorDataEvent) data;
+        ProcessInstanceError error = new ProcessInstanceError();
+        error.setMessage(event.getData().getErrorMessage());
+        error.setNodeDefinitionId(event.getData().getNodeDefinitionId());
+        pi.setError(error);
+        return pi;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceEventMerger.java
new file mode 100644
index 0000000000..d7abdb92a2
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceEventMerger.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.ArrayList;
+
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.index.model.ProcessInstance;
+
+public interface ProcessInstanceEventMerger extends Merger<ProcessInstanceDataEvent<?>, ProcessInstance> {
+
+    default ProcessInstance getOrNew(ProcessInstance pi, ProcessInstanceDataEvent<?> event) {
+        if (pi == null) {
+            pi = new ProcessInstance();
+            pi.setId(event.getKogitoProcessInstanceId());
+            pi.setProcessId(event.getKogitoProcessId());
+            pi.setMilestones(new ArrayList<>());
+            pi.setNodes(new ArrayList<>());
+        }
+        return pi;
+    }
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
new file mode 100644
index 0000000000..4984dbde88
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceNodeDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceNodeEventBody;
+import org.kie.kogito.index.model.Milestone;
+import org.kie.kogito.index.model.MilestoneStatus;
+import org.kie.kogito.index.model.Node;
+import org.kie.kogito.index.model.NodeInstance;
+import org.kie.kogito.index.model.ProcessInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.kie.kogito.event.process.ProcessInstanceNodeEventBody.EVENT_TYPE_ENTER;
+import static org.kie.kogito.event.process.ProcessInstanceNodeEventBody.EVENT_TYPE_EXIT;
+import static org.kie.kogito.index.DateTimeUtils.toZonedDateTime;
+
+@ApplicationScoped
+public class ProcessInstanceNodeDataEventMerger implements ProcessInstanceEventMerger {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessInstanceNodeDataEventMerger.class);
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof ProcessInstanceNodeDataEvent;
+    }
+
+    @Override
+    public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> data) {
+        pi = getOrNew(pi, data);
+        ProcessInstanceNodeDataEvent event = (ProcessInstanceNodeDataEvent) data;
+
+        List<NodeInstance> nodeInstances = Optional.ofNullable(pi.getNodes()).orElse(new ArrayList<>());
+
+        ProcessInstanceNodeEventBody body = event.getData();
+
+        NodeInstance nodeInstance = nodeInstances.stream().filter(e -> body.getNodeInstanceId().equals(e.getId())).findAny().orElse(new NodeInstance());
+        nodeInstances.removeIf(e -> e.getId().equals(body.getNodeInstanceId()));
+
+        LOGGER.debug("before merging: {}", nodeInstance);
+        nodeInstance.setDefinitionId(body.getNodeDefinitionId());
+        nodeInstance.setId(body.getNodeInstanceId());
+        nodeInstance.setNodeId(body.getNodeDefinitionId());
+        nodeInstance.setName(body.getNodeName());
+        nodeInstance.setType(body.getNodeType());
+        switch (body.getEventType()) {
+            case EVENT_TYPE_ENTER:
+                nodeInstance.setEnter(toZonedDateTime(body.getEventDate()));
+                break;
+            case EVENT_TYPE_EXIT:
+                nodeInstance.setExit(toZonedDateTime(body.getEventDate()));
+
+                if (nodeInstance.getEnter() == null) {
+                    // Adding a default enter time for exit events triggered by EventNodeInstances
+                    nodeInstance.setEnter(nodeInstance.getExit());
+                }
+                break;
+        }
+        nodeInstances.add(nodeInstance);
+
+        // milestone
+        if ("MilestoneNode".equals(event.getData().getNodeType())) {
+            List<Milestone> milestones = Optional.ofNullable(pi.getMilestones()).orElse(new ArrayList<>());
+            Optional<Milestone> found = milestones.stream().filter(e -> body.getNodeInstanceId().equals(e.getId())).findAny();
+            Milestone milestone = null;
+            if (found.isEmpty()) {
+                milestone = new Milestone();
+                milestones.add(milestone);
+            } else {
+                milestone = found.get();
+            }
+
+            milestone.setId(nodeInstance.getId());
+            milestone.setName(nodeInstance.getName());
+            milestone.setStatus(nodeInstance.getExit() != null ? MilestoneStatus.COMPLETED.name() : MilestoneStatus.ACTIVE.name());
+            milestones.add(milestone);
+
+            pi.setMilestones(milestones);
+        }
+
+        if (pi.getDefinition() != null) {
+            List<Node> nodes = Optional.ofNullable(pi.getDefinition().getNodes()).orElse(new ArrayList<>());
+
+            nodes.removeIf(e -> e.getId().equals(body.getNodeDefinitionId()));
+            Node node = new Node();
+            node.setId(body.getNodeDefinitionId());
+            node.setType(body.getNodeType());
+            node.setUniqueId(body.getNodeDefinitionId());
+            node.setMetadata(new HashMap<>());
+
+            nodes.add(node);
+            pi.getDefinition().setNodes(nodes);
+        }
+        LOGGER.debug("after merging: {}", nodeInstance);
+        pi.setNodes(nodeInstances);
+        return pi;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceSLADataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceSLADataEventMerger.java
new file mode 100644
index 0000000000..9f05431f98
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceSLADataEventMerger.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceSLADataEvent;
+import org.kie.kogito.index.model.ProcessInstance;
+
+public class ProcessInstanceSLADataEventMerger implements ProcessInstanceEventMerger {
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof ProcessInstanceSLADataEvent;
+    }
+
+    @Override
+    public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> event) {
+        // do nothing
+        return pi;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
new file mode 100644
index 0000000000..9c1d1303ad
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateEventBody;
+import org.kie.kogito.index.model.ProcessDefinition;
+import org.kie.kogito.index.model.ProcessInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.kie.kogito.index.DateTimeUtils.toZonedDateTime;
+
+@ApplicationScoped
+public class ProcessInstanceStateDataEventMerger implements ProcessInstanceEventMerger {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessInstanceStateDataEventMerger.class);
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof ProcessInstanceStateDataEvent;
+    }
+
+    @Override
+    public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> data) {
+        pi = getOrNew(pi, data);
+        ProcessInstanceStateDataEvent event = (ProcessInstanceStateDataEvent) data;
+        LOGGER.debug("Value before merging: {}", pi);
+        pi.setId(event.getData().getProcessInstanceId());
+        pi.setVersion(event.getData().getProcessVersion());
+        pi.setProcessId(event.getData().getProcessId());
+        pi.setProcessName(event.getData().getProcessName());
+        pi.setRootProcessInstanceId(event.getData().getRootProcessInstanceId());
+        pi.setRootProcessId(event.getData().getRootProcessId());
+        pi.setParentProcessInstanceId(event.getData().getParentInstanceId());
+        pi.setRoles(event.getData().getRoles());
+        pi.setState(event.getData().getState());
+        if (event.getData().getEventType() == null || event.getData().getEventType() == ProcessInstanceStateEventBody.EVENT_TYPE_STARTED) {
+            pi.setStart(toZonedDateTime(event.getData().getEventDate()));
+            pi.setCreatedBy(event.getData().getEventUser());
+        } else if (event.getData().getEventType() == ProcessInstanceStateEventBody.EVENT_TYPE_STARTED) {
+            pi.setEnd(toZonedDateTime(event.getData().getEventDate()));
+        }
+        pi.setBusinessKey(event.getData().getBusinessKey());
+        pi.setAddons(isNullOrEmpty(event.getKogitoAddons()) ? null : Set.of(event.getKogitoAddons().split(",")));
+        pi.setEndpoint(event.getSource() == null ? null : event.getSource().toString());
+        pi.setLastUpdate(toZonedDateTime(event.getTime()));
+        pi.setDefinition(definitions(event));
+        pi.setUpdatedBy(event.getData().getEventUser());
+        LOGGER.debug("Value after merging: {}", pi);
+        return pi;
+    }
+
+    private ProcessDefinition definitions(ProcessInstanceStateDataEvent event) {
+        LOGGER.debug("Value before merging: {}", event);
+        ProcessDefinition pd = new ProcessDefinition();
+        pd.setId(event.getData().getProcessId());
+        pd.setName(event.getData().getProcessName());
+        pd.setVersion(event.getData().getProcessVersion());
+        pd.setAddons(isNullOrEmpty(event.getKogitoAddons()) ? null : Set.of(event.getKogitoAddons().split(",")));
+        pd.setRoles(event.getData().getRoles());
+        pd.setType(event.getKogitoProcessType());
+        pd.setEndpoint(event.getSource() == null ? null : event.getSource().toString());
+        LOGGER.debug("Value after merging: {}", pd);
+        return pd;
+
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
new file mode 100644
index 0000000000..92a2c5e79a
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceVariableEventBody;
+import org.kie.kogito.index.json.JsonUtils;
+import org.kie.kogito.index.model.ProcessInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@ApplicationScoped
+public class ProcessInstanceVariableDataEventMerger implements ProcessInstanceEventMerger {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessInstanceVariableDataEventMerger.class);
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof ProcessInstanceVariableDataEvent;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> data) {
+        pi = getOrNew(pi, data);
+        ProcessInstanceVariableDataEvent event = (ProcessInstanceVariableDataEvent) data;
+        try {
+            ProcessInstanceVariableEventBody body = event.getData();
+            ObjectMapper mapper = JsonUtils.getObjectMapper();
+
+            Map<String, Object> variables = null;
+            if (pi.getVariables() == null) {
+                variables = new HashMap<>();
+            } else {
+                variables = new HashMap<>(mapper.treeToValue(pi.getVariables(), HashMap.class));
+            }
+            variables.put(body.getVariableName(), body.getVariableValue());
+            pi.setVariables(mapper.valueToTree(variables));
+        } catch (JsonProcessingException e) {
+            LOGGER.error("error during unmarshalling variable instance", e);
+        } catch (IllegalArgumentException e) {
+            LOGGER.error("error during merging variable instance event", e);
+        }
+        return pi;
+    }
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
new file mode 100644
index 0000000000..870a1d418c
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.HashSet;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.index.model.UserTaskInstance;
+
+@ApplicationScoped
+public class UserTaskInstanceAssignmentDataEventMerger implements UserTaskInstanceEventMerger {
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof UserTaskInstanceAssignmentDataEvent;
+    }
+
+    @Override
+    public UserTaskInstance merge(UserTaskInstance userTaskInstance, UserTaskInstanceDataEvent<?> data) {
+        UserTaskInstanceAssignmentDataEvent event = (UserTaskInstanceAssignmentDataEvent) data;
+        UserTaskInstanceAssignmentEventBody body = event.getData();
+
+        switch (body.getAssignmentType()) {
+            case "USER_OWNERS":
+                userTaskInstance.setPotentialUsers(new HashSet<>(body.getUsers()));
+                break;
+            case "USER_GROUPS":
+                userTaskInstance.setPotentialGroups(new HashSet<>(body.getUsers()));
+                break;
+            case "USERS_EXCLUDED":
+                userTaskInstance.setExcludedUsers(new HashSet<>(body.getUsers()));
+                break;
+            case "ADMIN_GROUPS":
+                userTaskInstance.setAdminGroups(new HashSet<>(body.getUsers()));
+                break;
+            case "ADMIN_USERS":
+                userTaskInstance.setAdminUsers(new HashSet<>(body.getUsers()));
+                break;
+        }
+        return userTaskInstance;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
new file mode 100644
index 0000000000..32875bf17f
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.index.DateTimeUtils;
+import org.kie.kogito.index.model.Attachment;
+import org.kie.kogito.index.model.UserTaskInstance;
+
+@ApplicationScoped
+public class UserTaskInstanceAttachmentDataEventMerger implements UserTaskInstanceEventMerger {
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof UserTaskInstanceAttachmentDataEvent;
+    }
+
+    @Override
+    public UserTaskInstance merge(UserTaskInstance userTaskInstance, UserTaskInstanceDataEvent<?> data) {
+        UserTaskInstanceAttachmentDataEvent event = (UserTaskInstanceAttachmentDataEvent) data;
+        UserTaskInstanceAttachmentEventBody body = event.getData();
+
+        List<Attachment> attachments = Optional.ofNullable(userTaskInstance.getAttachments()).orElse(new ArrayList<>());
+        userTaskInstance.setAttachments(attachments);
+
+        switch (body.getEventType()) {
+            case UserTaskInstanceAttachmentEventBody.EVENT_TYPE_ADDED:
+            case UserTaskInstanceAttachmentEventBody.EVENT_TYPE_CHANGE:
+                Optional<Attachment> found = attachments.stream().filter(e -> e.getId().equals(body.getAttachmentId())).findAny();
+                Attachment attachment;
+                if (found.isEmpty()) {
+                    attachment = new Attachment();
+                    attachments.add(attachment);
+                } else {
+                    attachment = found.get();
+                }
+                attachment.setId(body.getAttachmentId());
+                attachment.setName(body.getAttachmentName());
+                attachment.setContent(body.getAttachmentURI().toString());
+                attachment.setUpdatedBy(body.getEventUser() != null ? body.getEventUser() : "unknown");
+                attachment.setUpdatedAt(DateTimeUtils.toZonedDateTime(body.getEventDate()));
+
+                break;
+            case UserTaskInstanceAttachmentEventBody.EVENT_TYPE_DELETED:
+                attachments.removeIf(e -> e.getId().equals(body.getAttachmentId()));
+                break;
+        }
+        return userTaskInstance;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
new file mode 100644
index 0000000000..2d732ebfe6
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.index.DateTimeUtils;
+import org.kie.kogito.index.model.Comment;
+import org.kie.kogito.index.model.UserTaskInstance;
+
+@ApplicationScoped
+public class UserTaskInstanceCommentDataEventMerger implements UserTaskInstanceEventMerger {
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof UserTaskInstanceCommentDataEvent;
+    }
+
+    @Override
+    public UserTaskInstance merge(UserTaskInstance userTaskInstance, UserTaskInstanceDataEvent<?> data) {
+        UserTaskInstanceCommentDataEvent event = (UserTaskInstanceCommentDataEvent) data;
+        UserTaskInstanceCommentEventBody body = event.getData();
+        List<Comment> comments = Optional.ofNullable(userTaskInstance.getComments()).orElse(new ArrayList<>());
+        userTaskInstance.setComments(comments);
+
+        switch (body.getEventType()) {
+            case UserTaskInstanceCommentEventBody.EVENT_TYPE_ADDED:
+            case UserTaskInstanceCommentEventBody.EVENT_TYPE_CHANGE:
+                Optional<Comment> found = comments.stream().filter(e -> e.getId().equals(body.getCommentId())).findAny();
+                Comment comment;
+                if (found.isEmpty()) {
+                    comment = new Comment();
+                    comments.add(comment);
+                } else {
+                    comment = found.get();
+                }
+                comment.setId(body.getCommentId());
+                comment.setContent(body.getCommentContent());
+                comment.setUpdatedBy(body.getEventUser() != null ? body.getEventUser() : "unknown");
+                comment.setUpdatedAt(DateTimeUtils.toZonedDateTime(body.getEventDate()));
+
+                break;
+            case UserTaskInstanceCommentEventBody.EVENT_TYPE_DELETED:
+                comments.removeIf(e -> e.getId().equals(body.getCommentId()));
+                break;
+        }
+        return userTaskInstance;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
new file mode 100644
index 0000000000..4699e3ba66
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
+import org.kie.kogito.index.model.UserTaskInstance;
+
+@ApplicationScoped
+public class UserTaskInstanceDeadlineDataEventMerger implements UserTaskInstanceEventMerger {
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof UserTaskInstanceDeadlineDataEvent;
+    }
+
+    @Override
+    public UserTaskInstance merge(UserTaskInstance userTaskInstance, UserTaskInstanceDataEvent<?> data) {
+        // do nothing
+        return userTaskInstance;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceEventMerger.java
new file mode 100644
index 0000000000..62d86b6f71
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceEventMerger.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.index.model.UserTaskInstance;
+
+public interface UserTaskInstanceEventMerger extends Merger<UserTaskInstanceDataEvent<?>, UserTaskInstance> {
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
new file mode 100644
index 0000000000..77ba60c808
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.net.URI;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
+import org.kie.kogito.index.model.UserTaskInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.net.UrlEscapers;
+
+import static java.lang.String.format;
+import static org.kie.kogito.index.DateTimeUtils.toZonedDateTime;
+
+@ApplicationScoped
+public class UserTaskInstanceStateEventMerger implements UserTaskInstanceEventMerger {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UserTaskInstanceStateEventMerger.class);
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof UserTaskInstanceStateDataEvent;
+    }
+
+    @Override
+    public UserTaskInstance merge(UserTaskInstance task, UserTaskInstanceDataEvent<?> data) {
+        UserTaskInstanceStateDataEvent event = (UserTaskInstanceStateDataEvent) data;
+        LOGGER.debug("value before merging: {}", task);
+        task.setId(event.getData().getUserTaskInstanceId());
+        task.setProcessInstanceId(event.getData().getProcessInstanceId());
+        task.setProcessId(event.getKogitoProcessId());
+        task.setRootProcessId(event.getKogitoRootProcessId());
+        task.setRootProcessInstanceId(event.getKogitoRootProcessInstanceId());
+        task.setName(event.getData().getUserTaskName());
+        task.setDescription(event.getData().getUserTaskDescription());
+        task.setState(event.getData().getState());
+        task.setPriority(event.getData().getUserTaskPriority());
+        if (event.getData().getEventType() == null || event.getData().getEventType() == 1) {
+            task.setStarted(toZonedDateTime(event.getData().getEventDate()));
+        } else if (event.getData().getEventType() == 2) {
+            task.setCompleted(toZonedDateTime(event.getData().getEventDate()));
+        }
+
+        task.setActualOwner(event.getData().getActualOwner());
+        task.setEndpoint(
+                event.getSource() == null ? null : getEndpoint(event.getSource(), event.getData().getProcessInstanceId(), event.getData().getUserTaskName(), event.getData().getUserTaskInstanceId()));
+        task.setLastUpdate(toZonedDateTime(event.getData().getEventDate()));
+        task.setReferenceName(event.getData().getUserTaskReferenceName());
+        LOGGER.debug("value after merging: {}", task);
+        return task;
+    }
+
+    public String getEndpoint(URI source, String pId, String taskName, String taskId) {
+        String name = UrlEscapers.urlPathSegmentEscaper().escape(taskName);
+        return source.toString() + format("/%s/%s/%s", pId, name, taskId);
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
new file mode 100644
index 0000000000..9f256184b3
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event.mapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceVariableDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceVariableEventBody;
+import org.kie.kogito.index.json.JsonUtils;
+import org.kie.kogito.index.model.UserTaskInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+@ApplicationScoped
+public class UserTaskInstanceVariableDataEventMerger implements UserTaskInstanceEventMerger {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessInstanceVariableDataEventMerger.class);
+
+    @Override
+    public boolean accept(Object event) {
+        return event instanceof UserTaskInstanceVariableDataEvent;
+    }
+
+    @Override
+    public UserTaskInstance merge(UserTaskInstance userTaskInstance, UserTaskInstanceDataEvent<?> data) {
+        UserTaskInstanceVariableDataEvent event = (UserTaskInstanceVariableDataEvent) data;
+        try {
+            UserTaskInstanceVariableEventBody body = event.getData();
+            ObjectMapper mapper = JsonUtils.getObjectMapper();
+            switch (body.getVariableType()) {
+                case "INPUT":
+                    Map<String, Object> inVars = toMap(mapper, userTaskInstance.getInputs());
+                    inVars.put(body.getVariableName(), body.getVariableValue());
+                    userTaskInstance.setInputs(mapper.valueToTree(inVars));
+                    break;
+                case "OUTPUT":
+                    Map<String, Object> outVars = toMap(mapper, userTaskInstance.getOutputs());
+                    outVars.put(body.getVariableName(), body.getVariableValue());
+                    userTaskInstance.setOutputs(mapper.valueToTree(outVars));
+            }
+
+        } catch (JsonProcessingException e) {
+            LOGGER.error("error during unmarshalling variable instance", e);
+        } catch (IllegalArgumentException e) {
+            LOGGER.error("error during merging variable instance event", e);
+        }
+        return userTaskInstance;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> toMap(ObjectMapper mapper, ObjectNode node) throws JsonProcessingException, IllegalArgumentException {
+
+        Map<String, Object> variables = null;
+        if (node == null) {
+            variables = new HashMap<>();
+        } else {
+            variables = new HashMap<>(mapper.treeToValue(node, HashMap.class));
+
+        }
+        return variables;
+    }
+
+}
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/DataIndexParsingException.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/DataIndexParsingException.java
index 601b0e4279..8b4677aef7 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/DataIndexParsingException.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/DataIndexParsingException.java
@@ -1,22 +1,27 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.json;
 
 public class DataIndexParsingException extends RuntimeException {
 
+    private static final long serialVersionUID = 2205334685545385623L;
+
     public DataIndexParsingException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonProcessInstanceDataEventDeserializer.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonProcessInstanceDataEventDeserializer.java
new file mode 100644
index 0000000000..e60b3e4681
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonProcessInstanceDataEventDeserializer.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.json;
+
+import java.io.IOException;
+
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceNodeDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceSLADataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+public class JsonProcessInstanceDataEventDeserializer extends StdDeserializer<ProcessInstanceDataEvent<?>> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JsonProcessInstanceDataEventDeserializer.class);
+
+    private static final long serialVersionUID = 6152014726577574241L;
+
+    public JsonProcessInstanceDataEventDeserializer() {
+        this(null);
+    }
+
+    public JsonProcessInstanceDataEventDeserializer(Class<?> vc) {
+        super(vc);
+    }
+
+    @Override
+    public ProcessInstanceDataEvent<?> deserialize(JsonParser jp, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        JsonNode node = jp.getCodec().readTree(jp);
+        LOGGER.debug("Deserialize process instance data event: {}", node);
+        String type = node.get("type").asText();
+
+        switch (type) {
+            case "ProcessInstanceErrorDataEvent":
+                return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceErrorDataEvent.class);
+            case "ProcessInstanceNodeDataEvent":
+                return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceNodeDataEvent.class);
+            case "ProcessInstanceSLADataEvent":
+                return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceSLADataEvent.class);
+            case "ProcessInstanceStateDataEvent":
+                return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceStateDataEvent.class);
+            case "ProcessInstanceVariableDataEvent":
+                return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceVariableDataEvent.class);
+            default:
+                LOGGER.warn("Unknown type {} in json data {}", type, node);
+                return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceDataEvent.class);
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUserTaskInstanceDataEventDeserializer.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUserTaskInstanceDataEventDeserializer.java
new file mode 100644
index 0000000000..7aa0437f55
--- /dev/null
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUserTaskInstanceDataEventDeserializer.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.json;
+
+import java.io.IOException;
+
+import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceVariableDataEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+public class JsonUserTaskInstanceDataEventDeserializer extends StdDeserializer<UserTaskInstanceDataEvent<?>> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JsonUserTaskInstanceDataEventDeserializer.class);
+
+    private static final long serialVersionUID = -6626663191296012306L;
+
+    public JsonUserTaskInstanceDataEventDeserializer() {
+        this(null);
+    }
+
+    public JsonUserTaskInstanceDataEventDeserializer(Class<?> vc) {
+        super(vc);
+    }
+
+    @Override
+    public UserTaskInstanceDataEvent<?> deserialize(JsonParser jp, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        JsonNode node = jp.getCodec().readTree(jp);
+        LOGGER.debug("Deserialize user task instance data event: {}", node);
+        String type = node.get("type").asText();
+
+        switch (type) {
+            case "UserTaskInstanceAssignmentDataEvent":
+                return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceAssignmentDataEvent.class);
+            case "UserTaskInstanceAttachmentDataEvent":
+                return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceAttachmentDataEvent.class);
+            case "UserTaskInstanceCommentDataEvent":
+                return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceCommentDataEvent.class);
+            case "UserTaskInstanceDeadlineDataEvent":
+                return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceDeadlineDataEvent.class);
+            case "UserTaskInstanceStateDataEvent":
+                return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceStateDataEvent.class);
+            case "UserTaskInstanceVariableDataEvent":
+                return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceVariableDataEvent.class);
+            default:
+                LOGGER.warn("Unknown type {} in json data {}", type, node);
+                return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceDataEvent.class);
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java
index c267f820d3..c1d6a4c8c0 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java
@@ -1,22 +1,29 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.json;
 
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import io.cloudevents.jackson.JsonFormat;
@@ -36,6 +43,11 @@ public static ObjectMapper configure(ObjectMapper objectMapper) {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.registerModule(JsonFormat.getCloudEventJacksonModule());
         objectMapper.registerModule(new JavaTimeModule());
+
+        SimpleModule module = new SimpleModule("Kogito Cloud Events");
+        module.addDeserializer(ProcessInstanceDataEvent.class, new JsonProcessInstanceDataEventDeserializer());
+        module.addDeserializer(UserTaskInstanceDataEvent.class, new JsonUserTaskInstanceDataEventDeserializer());
+        objectMapper.registerModule(module);
         return objectMapper;
     }
 }
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
index 998101ea6c..cbe2a79ae2 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.json;
 
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/DataIndexServiceException.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/DataIndexServiceException.java
index 4539cf88c5..20a57eaf95 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/DataIndexServiceException.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/DataIndexServiceException.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service;
 
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
index 828a5adbc5..cafcab8789 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
@@ -1,27 +1,43 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
+import org.eclipse.microprofile.faulttolerance.Retry;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.index.event.mapper.ProcessDefinitionEventMerger;
+import org.kie.kogito.index.event.mapper.ProcessInstanceEventMerger;
+import org.kie.kogito.index.event.mapper.UserTaskInstanceEventMerger;
 import org.kie.kogito.index.model.Job;
-import org.kie.kogito.index.model.NodeInstance;
 import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.model.UserTaskInstance;
@@ -34,7 +50,6 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import static java.util.stream.Collectors.toList;
 import static org.kie.kogito.index.json.JsonUtils.getObjectMapper;
 import static org.kie.kogito.index.storage.Constants.ID;
 import static org.kie.kogito.index.storage.Constants.KOGITO_DOMAIN_ATTRIBUTE;
@@ -51,100 +66,235 @@ public class IndexingService {
     @Inject
     DataIndexStorageService manager;
 
-    public void indexProcessInstance(ProcessInstance pi) {
-        ProcessInstance previousPI = manager.getProcessInstancesCache().get(pi.getId());
-        if (previousPI != null) {
-            List<NodeInstance> nodes = previousPI.getNodes().stream().filter(n -> !pi.getNodes().contains(n)).collect(toList());
-            pi.getNodes().addAll(nodes);
+    @Inject
+    Instance<ProcessInstanceEventMerger> processInstanceMergers;
+
+    @Inject
+    Instance<UserTaskInstanceEventMerger> userTaskInstanceMergers;
+
+    @Inject
+    ProcessDefinitionEventMerger processDefinitionEventMerger;
+
+    //retry in case of rare but possible race condition during the insert for the first registry
+    @Retry(maxRetries = 3, delay = 300, jitter = 100, retryOn = ConcurrentModificationException.class)
+    public void indexProcessInstanceEvent(ProcessInstanceDataEvent<?> event) {
+        handleProcessInstanceEvent(event);
+    }
+
+    private ProcessInstance handleProcessInstanceEvent(ProcessInstanceDataEvent<?> event) {
+        Optional<ProcessInstance> found = Optional.ofNullable(manager.getProcessInstancesCache().get(event.getKogitoProcessInstanceId()));
+        ProcessInstance pi;
+        if (found.isEmpty()) {
+            pi = new ProcessInstance();
+            pi.setId(event.getKogitoProcessInstanceId());
+            pi.setProcessId(event.getKogitoProcessId());
+            pi.setMilestones(new ArrayList<>());
+            pi.setNodes(new ArrayList<>());
         } else {
-            pi.setCreatedBy(pi.getUpdatedBy());
-        }
-        ProcessDefinition definition = pi.getDefinition();
-        if (!manager.getProcessDefinitionsCache().containsKey(definition.getKey())) {
-            manager.getProcessDefinitionsCache().put(definition.getKey(), definition);
+            pi = found.get();
+
         }
+        processInstanceMergers.stream().filter(e -> e.accept(event)).findAny().ifPresent(e -> e.merge(pi, event));
+
         manager.getProcessInstancesCache().put(pi.getId(), pi);
+
+        LOGGER.debug("Stored Process Instance: {}", pi);
+
+        return pi;
     }
 
-    public void indexJob(Job job) {
-        manager.getJobsCache().put(job.getId(), job);
+    //retry in case of rare but possible race condition during the insert for the first registry
+    @Retry(maxRetries = 3, delay = 300, jitter = 100, retryOn = ConcurrentModificationException.class)
+    public void indexProcessDefinition(ProcessDefinitionDataEvent definitionDataEvent) {
+        if (!processDefinitionEventMerger.accept(definitionDataEvent)) {
+            return;
+        }
+        ProcessDefinition current = manager.getProcessDefinitionsCache().get(ProcessDefinition.toKey(definitionDataEvent.getKogitoProcessId(), definitionDataEvent.getData().getVersion()));
+        ProcessDefinition definition = processDefinitionEventMerger.merge(current, definitionDataEvent);
+        manager.getProcessDefinitionsCache().put(definition.getKey(), definition);
     }
 
-    public void indexUserTaskInstance(UserTaskInstance ut) {
+    //retry in case of rare but possible race condition during the insert for the first registry
+    @Retry(maxRetries = 3, delay = 300, jitter = 100, retryOn = ConcurrentModificationException.class)
+    public <T> void indexUserTaskInstanceEvent(UserTaskInstanceDataEvent<T> event) {
+        Optional<UserTaskInstance> found = Optional.ofNullable(manager.getUserTaskInstancesCache().get(event.getKogitoUserTaskInstanceId()));
+        UserTaskInstance ut;
+        if (found.isEmpty()) {
+            ut = new UserTaskInstance();
+            ut.setId(event.getKogitoUserTaskInstanceId());
+            ut.setAttachments(new ArrayList<>());
+            ut.setComments(new ArrayList<>());
+        } else {
+            ut = found.get();
+        }
+
+        userTaskInstanceMergers.stream().filter(e -> e.accept(event)).findAny().ifPresent(e -> e.merge(ut, event));
+        LOGGER.debug("Stored User Task Instance: {}", ut);
+
         manager.getUserTaskInstancesCache().put(ut.getId(), ut);
     }
 
-    public void indexModel(ObjectNode json) {
-        String processId = json.remove(PROCESS_ID).asText();
+    public void indexJob(Job job) {
+        manager.getJobsCache().put(job.getId(), job);
+    }
+
+    public void indexModel(ObjectNode updateData) {
+        String processId = updateData.remove(PROCESS_ID).asText();
         Storage<String, ObjectNode> cache = manager.getDomainModelCache(processId);
+
         if (cache == null) {
-            //          Unknown process type, ignore
             LOGGER.debug("Ignoring Kogito cloud event for unknown process: {}", processId);
             return;
         }
 
-        String processInstanceId = json.get(ID).asText();
+        String processInstanceId = updateData.get(ID).asText();
         String type = cache.getRootType();
-        ObjectNode model = cache.get(processInstanceId);
-        ObjectNode builder = getObjectMapper().createObjectNode();
-        builder.put("_type", type);
-        if (model == null) {
-            builder.setAll(json);
-        } else {
-            copyAllEventData(json, processInstanceId, model, builder);
-            ObjectNode kogito = indexKogitoDomain((ObjectNode) json.get(KOGITO_DOMAIN_ATTRIBUTE), (ObjectNode) model.get(KOGITO_DOMAIN_ATTRIBUTE));
-            builder.set(KOGITO_DOMAIN_ATTRIBUTE, kogito);
+        ObjectNode persistedModel = Optional.ofNullable(cache.get(processInstanceId)).orElse(getObjectMapper().createObjectNode());
+
+        LOGGER.debug("About to update model \n{}\n with data {}", persistedModel, updateData);
+        ObjectNode newModel = merge(processId, type, processInstanceId, persistedModel, updateData);
+
+        LOGGER.debug("Merged model\n{}\n for {} and id {}", newModel, processId, processInstanceId);
+        cache.put(processInstanceId, newModel);
+    }
+
+    private ObjectNode merge(String processId, String type, String processInstanceId, ObjectNode persistedModel, ObjectNode updateData) {
+        ObjectNode newModel = getObjectMapper().createObjectNode();
+        newModel.put("_type", type);
+        newModel.setAll(persistedModel);
+        newModel.put(ID, processInstanceId);
+        // copy variables
+        copyFieldsExcept(newModel, updateData, ID, PROCESS_ID, KOGITO_DOMAIN_ATTRIBUTE);
+
+        // now merge metadata
+        mergeMetadata(newModel, updateData);
+
+        return newModel;
+    }
+
+    private void mergeMetadata(ObjectNode newModel, ObjectNode updateData) {
+        if (!updateData.has(KOGITO_DOMAIN_ATTRIBUTE)) {
+            // nothing to merge
+            return;
         }
-        cache.put(processInstanceId, builder);
+
+        if (!newModel.has(KOGITO_DOMAIN_ATTRIBUTE)) {
+            newModel.set(KOGITO_DOMAIN_ATTRIBUTE, updateData.get(KOGITO_DOMAIN_ATTRIBUTE));
+            return;
+        }
+
+        mergeProcessInstance((ObjectNode) newModel.get(KOGITO_DOMAIN_ATTRIBUTE), (ObjectNode) updateData.get(KOGITO_DOMAIN_ATTRIBUTE));
+        mergeUserTaskInstance((ObjectNode) newModel.get(KOGITO_DOMAIN_ATTRIBUTE), (ObjectNode) updateData.get(KOGITO_DOMAIN_ATTRIBUTE));
+
     }
 
-    private void copyAllEventData(ObjectNode json, String processInstanceId, ObjectNode model, ObjectNode builder) {
-        ArrayNode indexPIArray = (ArrayNode) json.get(KOGITO_DOMAIN_ATTRIBUTE).get(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE);
-        if (indexPIArray == null) {
-            builder.setAll(model);
-        } else {
-            JsonNode id = indexPIArray.get(0).get(ID);
-            if (!processInstanceId.equals(id.asText())) {
-                //For sub-process merge with current values
-                builder.setAll(model);
+    private void copyFieldsExcept(ObjectNode newModel, ObjectNode updateData, String... exceptions) {
+        List<String> nonVars = Arrays.asList(exceptions);
+        Iterator<Map.Entry<String, JsonNode>> iterator = updateData.fields();
+        while (iterator.hasNext()) {
+            Map.Entry<String, JsonNode> element = iterator.next();
+            JsonNode node = element.getValue();
+            String key = element.getKey();
+            if (!nonVars.contains(key)) {
+                newModel.set(key, node);
             }
-            builder.setAll(json);
         }
     }
 
-    private ObjectNode indexKogitoDomain(ObjectNode kogitoEvent, ObjectNode kogitoCache) {
-        ObjectNode kogitoBuilder = getObjectMapper().createObjectNode();
-        kogitoBuilder.set(LAST_UPDATE, kogitoEvent.get(LAST_UPDATE));
+    private void mergeUserTaskInstance(ObjectNode newModel, ObjectNode updateData) {
+        if (!updateData.has(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE)) {
+            return;
+        }
 
-        ArrayNode indexPIArray = (ArrayNode) kogitoEvent.get(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE);
-        if (indexPIArray != null) {
-            kogitoBuilder.set(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE, copyToArray(kogitoCache.get(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE), indexPIArray));
-            kogitoBuilder.set(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE, kogitoCache.get(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE));
+        if (!newModel.has(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE)) {
+            newModel.set(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE, updateData.get(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE));
+            return;
         }
+        newModel.set(LAST_UPDATE, updateData.get(LAST_UPDATE));
+
+        ArrayNode currentUserTaskModel = (ArrayNode) newModel.get(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE);
+        ArrayNode updateUserTasks = (ArrayNode) updateData.get(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE);
 
-        ArrayNode indexTIArray = (ArrayNode) kogitoEvent.get(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE);
-        if (indexTIArray != null) {
-            kogitoBuilder.set(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE, copyToArray(kogitoCache.get(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE), indexTIArray));
-            kogitoBuilder.set(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE, kogitoCache.get(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE));
+        ArrayNode newArrayNode = getObjectMapper().createArrayNode();
+        newArrayNode.addAll(currentUserTaskModel);
+        for (int i = 0; i < updateUserTasks.size(); i++) {
+            String indexId = updateUserTasks.get(i).get(ID).asText();
+            boolean found = false;
+            for (int j = 0; j < currentUserTaskModel.size(); j++) {
+                String currentIndexId = currentUserTaskModel.get(j).get(ID).asText();
+                if (indexId.equals(currentIndexId)) {
+                    ObjectNode currentNode = (ObjectNode) newArrayNode.get(j);
+                    ObjectNode updateNode = ((ObjectNode) updateUserTasks.get(i));
+                    copyFieldsExcept(currentNode, updateNode, "comments", "attachments");
+                    mergeFieldArray("comments", currentNode, updateNode);
+                    mergeFieldArray("attachments", currentNode, updateNode);
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                newArrayNode.add(updateUserTasks.get(i));
+            }
         }
 
-        return kogitoBuilder;
+        newModel.set(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE, newArrayNode);
+        return;
     }
 
-    private ArrayNode copyToArray(JsonNode arrayCache, ArrayNode arrayEvent) {
-        if (arrayCache == null || arrayCache.isNull()) {
-            return getObjectMapper().createArrayNode().add(arrayEvent.get(0));
+    private void mergeFieldArray(String field, ObjectNode newModel, ObjectNode updateData) {
+        if (!updateData.has(field) || (updateData.has(field) && updateData.get(field).isNull())) {
+            return;
         }
-        ArrayNode arrayNode = (ArrayNode) arrayCache;
-        String indexId = arrayEvent.get(0).get(ID).asText();
-        for (int i = 0; i < arrayCache.size(); i++) {
-            if (indexId.equals(arrayCache.get(i).get(ID).asText())) {
-                arrayNode.set(i, arrayEvent.get(0));
-                return arrayNode;
+
+        if (!newModel.has(field) || (newModel.has(field) && newModel.get(field).isNull())) {
+            newModel.set(field, updateData.get(field));
+            return;
+        }
+
+        newModel.set(field, mergeArray((ArrayNode) newModel.get(field), (ArrayNode) updateData.get(field)));
+
+    }
+
+    private ObjectNode mergeProcessInstance(ObjectNode newModel, ObjectNode updateData) {
+        if (!updateData.has(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE)) {
+            return newModel;
+        }
+
+        if (!newModel.has(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE)) {
+            newModel.set(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE, updateData.get(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE));
+            return newModel;
+        }
+
+        newModel.set(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE, mergeArray((ArrayNode) newModel.get(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE), (ArrayNode) updateData.get(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE)));
+        return newModel;
+    }
+
+    private ArrayNode mergeArray(ArrayNode newModel, ArrayNode updateData) {
+        ArrayNode newArrayNode = getObjectMapper().createArrayNode();
+        newArrayNode.addAll(newModel);
+        for (int i = 0; i < updateData.size(); i++) {
+            String indexId = updateData.get(i).get(ID).asText();
+            boolean found = false;
+            for (int j = 0; j < newModel.size(); j++) {
+                String currentIndexId = newModel.get(j).get(ID).asText();
+                if (indexId.equals(currentIndexId)) {
+                    ((ObjectNode) newArrayNode.get(j)).setAll((ObjectNode) updateData.get(i));
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                newArrayNode.add(updateData.get(i));
+            }
+        }
+
+        Iterator<JsonNode> iterator = newArrayNode.iterator();
+        while (iterator.hasNext()) {
+            if (iterator.next().has("remove")) {
+                iterator.remove();
             }
         }
 
-        arrayNode.add(arrayEvent.get(0));
-        return arrayNode;
+        return newArrayNode;
     }
 }
diff --git a/data-index/data-index-common/src/main/resources/META-INF/beans.xml b/data-index/data-index-common/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-common/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/DataEventDeserializerTest.java b/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/DataEventDeserializerTest.java
new file mode 100644
index 0000000000..03f4625fc4
--- /dev/null
+++ b/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/DataEventDeserializerTest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.event;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateEventBody;
+import org.kie.kogito.index.json.JsonUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@TestInstance(Lifecycle.PER_CLASS)
+public class DataEventDeserializerTest {
+
+    private ObjectMapper mapper;
+
+    @BeforeAll
+
+    public void beforeAll() {
+        mapper = new ObjectMapper();
+        JsonUtils.configure(mapper);
+    }
+
+    @Test
+    public void testProcessInstanceDataEvent() throws IOException {
+        ProcessInstanceStateDataEvent dataEvent = new ProcessInstanceStateDataEvent("source", "addons", "identity", new HashMap<>(), new ProcessInstanceStateEventBody());
+
+        String jsonValue = mapper.writeValueAsString(dataEvent);
+        ProcessInstanceDataEvent<?> readDataEvent = mapper.readValue(jsonValue.getBytes(), ProcessInstanceDataEvent.class);
+        Assertions.assertEquals(readDataEvent, dataEvent);
+
+    }
+
+    @Test
+    public void testUserTaskInstanceDataEvent() throws IOException {
+        UserTaskInstanceStateDataEvent dataEvent = new UserTaskInstanceStateDataEvent("source", "addons", "identity", new HashMap<>(), new UserTaskInstanceStateEventBody());
+
+        String jsonValue = mapper.writeValueAsString(dataEvent);
+        UserTaskInstanceDataEvent<?> readDataEvent = mapper.readValue(jsonValue.getBytes(), UserTaskInstanceDataEvent.class);
+        Assertions.assertEquals(readDataEvent, dataEvent);
+
+    }
+
+}
diff --git a/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/UserTaskInstanceEventMapperTest.java b/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/UserTaskInstanceEventMapperTest.java
index 58de275f31..d60fd2a974 100644
--- a/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/UserTaskInstanceEventMapperTest.java
+++ b/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/UserTaskInstanceEventMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.event;
 
 import java.net.URI;
@@ -23,13 +25,14 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.kie.kogito.index.event.mapper.UserTaskInstanceStateEventMerger;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class UserTaskInstanceEventMapperTest {
 
-    private UserTaskInstanceEventMapper mapper = new UserTaskInstanceEventMapper();
+    private UserTaskInstanceStateEventMerger mapper = new UserTaskInstanceStateEventMerger();
 
     private static Stream<Arguments> provideEndpoint() {
         String pId = UUID.randomUUID().toString();
diff --git a/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMergerTest.java b/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMergerTest.java
new file mode 100644
index 0000000000..331376590c
--- /dev/null
+++ b/data-index/data-index-common/src/test/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMergerTest.java
@@ -0,0 +1,115 @@
+package org.kie.kogito.index.event.mapper;
+
+import java.time.ZonedDateTime;
+import java.util.Date;
+import java.util.HashMap;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.kie.kogito.event.process.ProcessInstanceNodeDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceNodeEventBody;
+import org.kie.kogito.index.model.NodeInstance;
+import org.kie.kogito.index.model.ProcessInstance;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.kie.kogito.event.process.ProcessInstanceNodeEventBody.EVENT_TYPE_ENTER;
+import static org.kie.kogito.event.process.ProcessInstanceNodeEventBody.EVENT_TYPE_EXIT;
+import static org.kie.kogito.index.DateTimeUtils.toZonedDateTime;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ProcessInstanceNodeDataEventMergerTest {
+
+    private static final String HIRING_PROCESS_ID = "hiring";
+    private static final String PROCESS_INSTANCE_ID = "7b8ea46e-ffe7-4fdd-8cf5-72a3f0353947";
+
+    private static final String START_NODE_INSTANCE_ID = "35d525eb-868a-4056-91cc-dbc3804d157c";
+    private static final String START = "Start";
+    private static final String START_NODE_DEFINITION_ID = "_1639F738-45F3-4CD6-A80E-CCEBAA605D56";
+    private static final String START_NODE_TYPE = "StartNode";
+
+    private static final String ACTION_NODE_INSTANCE_ID = "08ee9c9c-cf67-47e5-a7e6-901a6f556c0a";
+    private static final String ACTION_NODE = "New Hiring";
+    private static final String ACTION_NODE_DEFINITION_ID = "_5BDBE48C-CC83-46A9-9D56-F846F8FC1045";
+    private static final String ACTION_NODE_TYPE = "ActionNode";
+
+    private static final String BOUNDARY_EVENT_NODE_INSTANCE_ID = "f22510d2-e0e5-460a-901e-494cda3dea26";
+    private static final String BOUNDARY_EVENT_NODE_NODE = "BoundaryEvent";
+    private static final String BOUNDARY_EVENT_NODE_NODE_DEFINITION_ID = "_116F3C54-A10E-4952-9E08-1CACE74CED0B";
+    private static final String BOUNDARY_EVENT_NODE_NODE_TYPE = "BoundaryEventNode";
+
+    private ProcessInstanceNodeDataEventMerger merger;
+    private ProcessInstance pi;
+
+    @BeforeEach
+    public void setup() {
+        merger = new ProcessInstanceNodeDataEventMerger();
+        pi = new ProcessInstance();
+        pi.setProcessId(HIRING_PROCESS_ID);
+        pi.setProcessName(HIRING_PROCESS_ID);
+        pi.setId(PROCESS_INSTANCE_ID);
+        pi.setVersion("1.0");
+        pi.setStart(ZonedDateTime.now());
+        pi.setState(1);
+    }
+
+    @Test
+    public void testMergeProcessInstanceNodeDataEvents() {
+        ProcessInstanceNodeDataEvent startNodeEnter = buildNodeEvent(START_NODE_INSTANCE_ID, START, START_NODE_DEFINITION_ID, START_NODE_TYPE, EVENT_TYPE_ENTER);
+
+        merger.merge(pi, startNodeEnter);
+
+        ProcessInstanceNodeDataEvent startNodeExit = buildNodeEvent(START_NODE_INSTANCE_ID, START, START_NODE_DEFINITION_ID, START_NODE_TYPE, EVENT_TYPE_EXIT);
+
+        merger.merge(pi, startNodeExit);
+
+        ProcessInstanceNodeDataEvent actionNodeEnter = buildNodeEvent(ACTION_NODE_INSTANCE_ID, ACTION_NODE, ACTION_NODE_DEFINITION_ID, ACTION_NODE_TYPE, EVENT_TYPE_ENTER);
+
+        merger.merge(pi, actionNodeEnter);
+
+        ProcessInstanceNodeDataEvent actionNodeExit = buildNodeEvent(ACTION_NODE_INSTANCE_ID, ACTION_NODE, ACTION_NODE_DEFINITION_ID, ACTION_NODE_TYPE, EVENT_TYPE_EXIT);
+
+        merger.merge(pi, actionNodeExit);
+
+        assertThat(pi.getNodes()).hasSize(2);
+
+        verifyNode(pi.getNodes().get(0), startNodeEnter.getData(), startNodeEnter.getData().getEventDate(), startNodeExit.getData().getEventDate());
+        verifyNode(pi.getNodes().get(1), actionNodeEnter.getData(), actionNodeEnter.getData().getEventDate(), actionNodeExit.getData().getEventDate());
+    }
+
+    @Test
+    public void testMergeBoundaryNodeExitEvent() {
+        ProcessInstanceNodeDataEvent boundaryEvent =
+                buildNodeEvent(BOUNDARY_EVENT_NODE_INSTANCE_ID, BOUNDARY_EVENT_NODE_NODE, BOUNDARY_EVENT_NODE_NODE_DEFINITION_ID, BOUNDARY_EVENT_NODE_NODE_TYPE, EVENT_TYPE_EXIT);
+
+        merger.merge(pi, boundaryEvent);
+
+        assertThat(pi.getNodes()).hasSize(1);
+
+        verifyNode(pi.getNodes().get(0), boundaryEvent.getData(), boundaryEvent.getData().getEventDate(), boundaryEvent.getData().getEventDate());
+    }
+
+    private void verifyNode(NodeInstance nodeInstance, ProcessInstanceNodeEventBody eventBody, Date enter, Date exit) {
+        assertThat(nodeInstance)
+                .hasFieldOrPropertyWithValue("id", eventBody.getNodeInstanceId())
+                .hasFieldOrPropertyWithValue("nodeId", eventBody.getNodeDefinitionId())
+                .hasFieldOrPropertyWithValue("definitionId", eventBody.getNodeDefinitionId())
+                .hasFieldOrPropertyWithValue("name", eventBody.getNodeName())
+                .hasFieldOrPropertyWithValue("type", eventBody.getNodeType())
+                .hasFieldOrPropertyWithValue("enter", toZonedDateTime(enter))
+                .hasFieldOrPropertyWithValue("exit", toZonedDateTime(exit));
+    }
+
+    private ProcessInstanceNodeDataEvent buildNodeEvent(String nodeInstanceId, String nodeName, String nodeDefinitionId, String nodeType, Integer eventType) {
+        return new ProcessInstanceNodeDataEvent(HIRING_PROCESS_ID, "", "", new HashMap<>(), ProcessInstanceNodeEventBody.create()
+                .processId(HIRING_PROCESS_ID)
+                .processInstanceId(PROCESS_INSTANCE_ID)
+                .nodeInstanceId(nodeInstanceId)
+                .nodeName(nodeName)
+                .nodeDefinitionId(nodeDefinitionId)
+                .nodeType(nodeType)
+                .eventDate(new Date())
+                .eventType(eventType)
+                .build());
+    }
+}
diff --git a/data-index/data-index-graphql/pom.xml b/data-index/data-index-graphql/pom.xml
index 797ebdaf95..21cb9eeb0b 100644
--- a/data-index/data-index-graphql/pom.xml
+++ b/data-index/data-index-graphql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
index d41fbae9d9..e6a97e630e 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql;
 
@@ -140,6 +143,9 @@ public ProcessDefinition getProcessDefinition(DataFetchingEnvironment env) {
 
     protected String getServiceUrl(String endpoint, String processId) {
         LOGGER.debug("Process endpoint {}", endpoint);
+        if (endpoint == null) {
+            return null;
+        }
         if (endpoint.startsWith("/")) {
             LOGGER.warn("Process '{}' endpoint '{}', does not contain full URL, please review the kogito.service.url system property to point the public URL for this runtime.",
                     processId, endpoint);
@@ -154,7 +160,7 @@ protected String getServiceUrl(String endpoint, String processId) {
     }
 
     private String getContext(String processId) {
-        return processId.contains(".") ? processId.substring(processId.lastIndexOf('.') + 1) : processId;
+        return processId != null && processId.contains(".") ? processId.substring(processId.lastIndexOf('.') + 1) : processId;
     }
 
     protected Collection<ProcessInstance> getChildProcessInstancesValues(DataFetchingEnvironment env) {
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java
index cc56352263..3b72407932 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.graphql;
 
 import graphql.schema.Coercing;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
index 6db75dc9bc..b1c09be8c6 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.graphql;
 
 import java.time.DateTimeException;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
index 9c23020dd5..d1d427515d 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLObjectTypeMapper.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLObjectTypeMapper.java
index b981b756e5..947cdfdb88 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLObjectTypeMapper.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLObjectTypeMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
index b375c98529..baaf75cbbb 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
index abcdc85250..3d4ef5377c 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLSchemaManager.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLSchemaManager.java
index a471621913..76c203df9e 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLSchemaManager.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLSchemaManager.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.graphql;
 
 import java.util.function.Consumer;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcher.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcher.java
index fb27c8c1dd..ff21c10852 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcher.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcher.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
index 10e1e44da2..c8dad32013 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.graphql;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
index 2fa0e148d0..4c12f8458a 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.graphql;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/AbstractInputObjectTypeMapper.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/AbstractInputObjectTypeMapper.java
index 7f4a641787..9543079a6a 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/AbstractInputObjectTypeMapper.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/AbstractInputObjectTypeMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLInputObjectTypeMapper.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLInputObjectTypeMapper.java
index dad768a9f2..92d08f4dbd 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLInputObjectTypeMapper.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLInputObjectTypeMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLOrderByTypeMapper.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLOrderByTypeMapper.java
index 958781afe1..924093f319 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLOrderByTypeMapper.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLOrderByTypeMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryMapper.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryMapper.java
index fab5af3471..20a333d5b0 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryMapper.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderByParser.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderByParser.java
index edefa837a5..b9fc2ee3aa 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderByParser.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderByParser.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParser.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParser.java
index 6b5ef5bfd3..cb4f020107 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParser.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParser.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParserRegistry.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParserRegistry.java
index 6e201e8e74..77d3faaacb 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParserRegistry.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/query/GraphQLQueryParserRegistry.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
index 3008c56ae5..762a69d7bd 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.vertx;
 
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
index f4c030201d..6707ec9107 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.vertx;
 
diff --git a/data-index/data-index-graphql/src/main/resources/META-INF/beans.xml b/data-index/data-index-graphql/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-graphql/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-graphql/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls b/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls
index 74d90e2545..4e6f30b764 100644
--- a/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls
+++ b/data-index/data-index-graphql/src/main/resources/basic.schema.graphqls
@@ -44,8 +44,11 @@ type ProcessDefinition {
     addons: [String!]
     roles: [String!]
     type: String
-    endpoint: String!
+    endpoint: String
     serviceUrl: String
+    description: String
+    annotations: [String]
+    metadata: JSON
 }
 
 input ProcessDefinitionOrderBy {
@@ -72,13 +75,13 @@ type ProcessInstance {
     rootProcessInstanceId: String
     rootProcessId: String
     roles: [String!]
-    state: ProcessInstanceState!
+    state: ProcessInstanceState
     endpoint: String!
     serviceUrl: String
-    nodes: [NodeInstance!]!
+    nodes: [NodeInstance!]
     milestones: [Milestone!]
     variables: JSON
-    start: DateTime!
+    start: DateTime
     end: DateTime
     parentProcessInstance: ProcessInstance
     childProcessInstances: [ProcessInstance!]
@@ -345,15 +348,15 @@ type UserTaskInstance {
     name: String
     priority: String
     processInstanceId: String!
-    processId: String!
+    processId: String
     rootProcessInstanceId: String
     rootProcessId: String
-    state: String!
+    state: String
     actualOwner: String
     adminGroups: [String!]
     adminUsers: [String!]
     completed: DateTime
-    started: DateTime!
+    started: DateTime
     excludedUsers: [String!]
     potentialGroups: [String!]
     potentialUsers: [String!]
diff --git a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java
index eefece2bcc..224e45fce3 100644
--- a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java
+++ b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DateTimeScalarTypeProducerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.graphql;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java
index fa26faa8c7..46aa657512 100644
--- a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java
+++ b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercingTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql;
 
diff --git a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcherTest.java b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcherTest.java
index 623f19abbb..c1840a4c5c 100644
--- a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcherTest.java
+++ b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/JsonPropertyDataFetcherTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.graphql;
 
 import java.util.List;
diff --git a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderParserTest.java b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderParserTest.java
index 7b5850d485..438f12852b 100644
--- a/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderParserTest.java
+++ b/data-index/data-index-graphql/src/test/java/org/kie/kogito/index/graphql/query/GraphQLQueryOrderParserTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.graphql.query;
 
diff --git a/data-index/data-index-service/data-index-service-common/pom.xml b/data-index/data-index-service/data-index-service-common/pom.xml
index 4dfc464462..af7ac6a134 100644
--- a/data-index/data-index-service/data-index-service-common/pom.xml
+++ b/data-index/data-index-service/data-index-service-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -13,6 +33,12 @@
   <name>Kogito Apps :: Data Index Service Common</name>
 
   <dependencies>
+	<dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>data-index-test-utils</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>data-index-storage-api</artifactId>
@@ -69,7 +95,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-rest-client-reactive</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-http-vertx</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkiverse.reactivemessaging.http</groupId>
       <artifactId>quarkus-reactive-messaging-http</artifactId>
@@ -87,11 +116,7 @@
       <artifactId>quarkus-smallrye-health</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>data-index-test-utils</artifactId>
-      <scope>test</scope>
-    </dependency>
+
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
index 4ac42ab22c..ebaf891adc 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
@@ -1,35 +1,32 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.api;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.index.api.KogitoRuntimeClient;
-import org.kie.kogito.index.model.Job;
+import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
 import org.kie.kogito.index.model.Node;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.model.UserTaskInstance;
@@ -37,21 +34,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.quarkus.security.credential.TokenCredential;
-import io.quarkus.security.identity.SecurityIdentity;
 import io.vertx.core.AsyncResult;
-import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.HttpRequest;
 import io.vertx.ext.web.client.HttpResponse;
 import io.vertx.ext.web.client.WebClient;
-import io.vertx.ext.web.client.WebClientOptions;
 
 import static java.lang.String.format;
 
 @ApplicationScoped
-public class KogitoRuntimeClientImpl implements KogitoRuntimeClient {
+class KogitoRuntimeClientImpl extends KogitoRuntimeCommonClient implements KogitoRuntimeClient {
 
     public static final String ABORT_PROCESS_INSTANCE_PATH = "/management/processes/%s/instances/%s";
     public static final String RETRY_PROCESS_INSTANCE_PATH = "/management/processes/%s/instances/%s/retrigger";
@@ -64,9 +57,6 @@ public class KogitoRuntimeClientImpl implements KogitoRuntimeClient {
     public static final String RETRIGGER_NODE_INSTANCE_PATH = "/management/processes/%s/instances/%s/nodeInstances/%s"; // nodeInstance Id
     public static final String CANCEL_NODE_INSTANCE_PATH = "/management/processes/%s/instances/%s/nodeInstances/%s"; // nodeInstance Id
 
-    public static final String CANCEL_JOB_PATH = "/%s";
-    public static final String RESCHEDULE_JOB_PATH = "/%s";
-
     public static final String GET_TASK_SCHEMA_PATH = "/%s/%s/%s/%s/schema";
     public static final String UPDATE_USER_TASK_INSTANCE_PATH = "/management/processes/%s/instances/%s/tasks/%s";
 
@@ -79,39 +69,6 @@ public class KogitoRuntimeClientImpl implements KogitoRuntimeClient {
     public static final String DELETE_USER_TASK_INSTANCE_ATTACHMENT_PATH = "/%s/%s/%s/%s/attachments/%s";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(KogitoRuntimeClientImpl.class);
-    private Vertx vertx;
-    private SecurityIdentity identity;
-    protected Map<String, WebClient> serviceWebClientMap = new HashMap<>();
-
-    @ConfigProperty(name = "kogito.dataindex.gateway.url")
-    protected Optional<String> gatewayTargetUrl;
-
-    @Inject
-    public KogitoRuntimeClientImpl(Vertx vertx, SecurityIdentity identity) {
-        this.vertx = vertx;
-        this.identity = identity;
-    }
-
-    protected WebClient getWebClient(String runtimeServiceUrl) {
-        if (runtimeServiceUrl == null) {
-            throw new DataIndexServiceException("Runtime service URL not defined, please review the kogito.service.url system property to point the public URL for this runtime.");
-        } else {
-            return serviceWebClientMap.computeIfAbsent(runtimeServiceUrl, url -> WebClient.create(vertx, getWebClientToURLOptions(runtimeServiceUrl)));
-        }
-    }
-
-    protected WebClientOptions getWebClientToURLOptions(String targetHttpURL) {
-        try {
-            URL dataIndexURL = new URL(targetHttpURL);
-            return new WebClientOptions()
-                    .setDefaultHost(gatewayTargetUrl.orElse(dataIndexURL.getHost()))
-                    .setDefaultPort((dataIndexURL.getPort() != -1 ? dataIndexURL.getPort() : dataIndexURL.getDefaultPort()))
-                    .setSsl(dataIndexURL.getProtocol().compareToIgnoreCase("https") == 0);
-        } catch (MalformedURLException ex) {
-            LOGGER.error("Invalid runtime service URL: " + targetHttpURL, ex);
-            return null;
-        }
-    }
 
     @Override
     public CompletableFuture<String> abortProcessInstance(String serviceURL, ProcessInstance processInstance) {
@@ -160,37 +117,21 @@ public CompletableFuture<List<Node>> getProcessDefinitionNodes(String serviceURL
     public CompletableFuture<String> triggerNodeInstance(String serviceURL, ProcessInstance processInstance, String nodeDefinitionId) {
         String requestURI = format(TRIGGER_NODE_INSTANCE_PATH, processInstance.getProcessId(), processInstance.getId(), nodeDefinitionId);
         return sendPostClientRequest(getWebClient(serviceURL), requestURI,
-                "Trigger Node " + nodeDefinitionId +
-                        "from ProcessInstance with id: " + processInstance.getId());
+                "Trigger Node " + nodeDefinitionId + FROM_PROCESS_INSTANCE_WITH_ID + processInstance.getId());
     }
 
     @Override
     public CompletableFuture<String> retriggerNodeInstance(String serviceURL, ProcessInstance processInstance, String nodeInstanceId) {
         String requestURI = format(RETRIGGER_NODE_INSTANCE_PATH, processInstance.getProcessId(), processInstance.getId(), nodeInstanceId);
         return sendPostClientRequest(getWebClient(serviceURL), requestURI,
-                "Retrigger NodeInstance " + nodeInstanceId +
-                        "from ProcessInstance with id: " + processInstance.getId());
+                "Retrigger NodeInstance " + nodeInstanceId + FROM_PROCESS_INSTANCE_WITH_ID + processInstance.getId());
     }
 
     @Override
     public CompletableFuture<String> cancelNodeInstance(String serviceURL, ProcessInstance processInstance, String nodeInstanceId) {
         String requestURI = format(CANCEL_NODE_INSTANCE_PATH, processInstance.getProcessId(), processInstance.getId(), nodeInstanceId);
         return sendDeleteClientRequest(getWebClient(serviceURL), requestURI,
-                "Cancel NodeInstance " + nodeInstanceId +
-                        "from ProcessInstance with id: " + processInstance.getId());
-    }
-
-    @Override
-    public CompletableFuture<String> cancelJob(String serviceURL, Job job) {
-        String requestURI = format(CANCEL_JOB_PATH, job.getId());
-        return sendDeleteClientRequest(getWebClient(serviceURL), requestURI, "CANCEL Job with id: " + job.getId());
-    }
-
-    @Override
-    public CompletableFuture<String> rescheduleJob(String serviceURL, Job job, String newJobData) {
-        String requestURI = format(RESCHEDULE_JOB_PATH, job.getId());
-        return sendJSONPutClientRequest(getWebClient(serviceURL), requestURI,
-                "RESCHEDULED JOB with id: " + job.getId(), newJobData);
+                "Cancel NodeInstance " + nodeInstanceId + FROM_PROCESS_INSTANCE_WITH_ID + processInstance.getId());
     }
 
     @Override
@@ -277,40 +218,28 @@ private String getUserGroupsURIParameter(String user, List<String> groups) {
         return builder.toString();
     }
 
-    protected CompletableFuture sendDeleteClientRequest(WebClient webClient, String requestURI, String logMessage) {
-        CompletableFuture future = new CompletableFuture<>();
-        webClient.delete(requestURI)
-                .putHeader("Authorization", getAuthHeader())
-                .send(res -> asyncHttpResponseTreatment(res, future, logMessage));
-        return future;
-    }
-
     protected CompletableFuture sendPostWithBodyClientRequest(WebClient webClient, String requestURI, String logMessage, String body, String contentType) {
         CompletableFuture future = new CompletableFuture<>();
+
         HttpRequest<Buffer> request = webClient.post(requestURI)
                 .putHeader("Authorization", getAuthHeader())
                 .putHeader("Content-Type", contentType);
         if (MediaType.APPLICATION_JSON.equals(contentType)) {
+            LOGGER.debug("Sending Json Body: {} POST  to URI {}", body, requestURI);
             request.sendJson(new JsonObject(body), res -> asyncHttpResponseTreatment(res, future, logMessage));
         } else {
+            LOGGER.debug("Sending Buffer(Body): {} POST to URI {}", body, requestURI);
             request.sendBuffer(Buffer.buffer(body), res -> asyncHttpResponseTreatment(res, future, logMessage));
         }
         return future;
     }
 
-    private void asyncHttpResponseTreatment(AsyncResult<HttpResponse<Buffer>> res, CompletableFuture future, String logMessage) {
-        if (res.succeeded() && ((res.result().statusCode() == 200 || res.result().statusCode() == 201))) {
-            future.complete(res.result().bodyAsString() != null ? res.result().bodyAsString() : "Successfully performed: " + logMessage);
-        } else {
-            future.completeExceptionally(new DataIndexServiceException(getErrorMessage(logMessage, res.result())));
-        }
-    }
-
     protected CompletableFuture sendPostClientRequest(WebClient webClient, String requestURI, String logMessage) {
         CompletableFuture future = new CompletableFuture<>();
         webClient.post(requestURI)
                 .putHeader("Authorization", getAuthHeader())
                 .send(res -> asyncHttpResponseTreatment(res, future, logMessage));
+        LOGGER.debug("Sending post to URI {}", requestURI);
         return future;
     }
 
@@ -324,27 +253,22 @@ protected CompletableFuture sendPutClientRequest(WebClient webClient, String req
                 .putHeader("Authorization", getAuthHeader())
                 .putHeader("Content-Type", contentType);
         if (MediaType.APPLICATION_JSON.equals(contentType)) {
+            LOGGER.debug("Sending Json Body: {} PUT  to URI {}", body, requestURI);
             request.sendJson(new JsonObject(body), res -> asyncHttpResponseTreatment(res, future, logMessage));
         } else {
+            LOGGER.debug("Sending Buffer(Body): {} PUT to URI {}", body, requestURI);
             request.sendBuffer(Buffer.buffer(body), res -> asyncHttpResponseTreatment(res, future, logMessage));
         }
         return future;
     }
 
-    protected CompletableFuture sendPatchClientRequest(WebClient webClient, String requestURI, String logMessage, JsonObject jsonBody) {
-        CompletableFuture future = new CompletableFuture<>();
-        webClient.patch(requestURI)
-                .putHeader("Authorization", getAuthHeader())
-                .sendJson(jsonBody, res -> asyncHttpResponseTreatment(res, future, logMessage));
-        return future;
-    }
-
     protected CompletableFuture sendGetClientRequest(WebClient webClient, String requestURI, String logMessage, Class type) {
         CompletableFuture future = new CompletableFuture<>();
 
         webClient.get(requestURI)
                 .putHeader("Authorization", getAuthHeader())
                 .send(res -> send(logMessage, type, future, res));
+        LOGGER.debug("Sending GET to URI {}", requestURI);
         return future;
     }
 
@@ -362,20 +286,4 @@ protected void send(String logMessage, Class type, CompletableFuture future, Asy
         }
     }
 
-    private String getErrorMessage(String logMessage, HttpResponse<Buffer> result) {
-        String errorMessage = "FAILED: " + logMessage;
-        if (result != null) {
-            errorMessage += " errorCode:" + result.statusCode() +
-                    " errorStatus:" + result.statusMessage() +
-                    " errorMessage:" + (result.body() != null ? result.body().toString() : "-");
-        }
-        return errorMessage;
-    }
-
-    protected String getAuthHeader() {
-        if (identity != null && identity.getCredential(TokenCredential.class) != null) {
-            return "Bearer " + identity.getCredential(TokenCredential.class).getToken();
-        }
-        return "";
-    }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
index c27bf657c4..b6cd7a7550 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.auth;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
index 25ee8cade1..5d20283f9f 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.graphql;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
index d0e389e084..9a5aec6710 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.graphql;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapper.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapper.java
index 3caa719024..bc1e5c3c41 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapper.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapper.java
@@ -1,23 +1,32 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.json;
 
+import java.util.Collections;
+import java.util.Map;
 import java.util.function.Function;
 
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -30,56 +39,80 @@
 import static org.kie.kogito.index.storage.Constants.PROCESS_INSTANCES_DOMAIN_ATTRIBUTE;
 import static org.kie.kogito.index.storage.Constants.PROCESS_NAME;
 
-public class ProcessInstanceMetaMapper implements Function<ProcessInstanceDataEvent, ObjectNode> {
+public class ProcessInstanceMetaMapper implements Function<ProcessInstanceDataEvent<?>, ObjectNode> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessInstanceMetaMapper.class);
 
     @Override
-    public ObjectNode apply(ProcessInstanceDataEvent event) {
+    public ObjectNode apply(ProcessInstanceDataEvent<?> event) {
         if (event == null) {
             return null;
-        } else {
-            ObjectNode json = getObjectMapper().createObjectNode();
-            json.put(ID, isNullOrEmpty(event.getData().getRootInstanceId()) ? event.getData().getId() : event.getData().getRootInstanceId());
-            json.put(PROCESS_ID, isNullOrEmpty(event.getData().getRootProcessId()) ? event.getData().getProcessId() : event.getData().getRootProcessId());
-            ObjectNode kogito = getObjectMapper().createObjectNode();
-            kogito.put(LAST_UPDATE, event.getTime() == null ? null : event.getTime().toInstant().toEpochMilli());
-            kogito.withArray(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE).add(getProcessJson(event));
-            json.set(KOGITO_DOMAIN_ATTRIBUTE, kogito);
-            json.setAll((ObjectNode) getObjectMapper().valueToTree(event.getData().getVariables()));
-            return json;
         }
+
+        ObjectNode json = getObjectMapper().createObjectNode();
+        json.put(ID, isNullOrEmpty(event.getKogitoRootProcessInstanceId()) ? event.getKogitoProcessInstanceId() : event.getKogitoRootProcessInstanceId());
+        json.put(PROCESS_ID, isNullOrEmpty(event.getKogitoRootProcessId()) ? event.getKogitoProcessId() : event.getKogitoRootProcessId());
+        ObjectNode kogito = getObjectMapper().createObjectNode();
+        kogito.withArray(PROCESS_INSTANCES_DOMAIN_ATTRIBUTE).add(getProcessJson(event));
+        kogito.put(LAST_UPDATE, event.getTime() == null ? null : event.getTime().toInstant().toEpochMilli());
+        json.set(KOGITO_DOMAIN_ATTRIBUTE, kogito);
+
+        if (event instanceof ProcessInstanceVariableDataEvent) {
+            ProcessInstanceVariableDataEvent vars = (ProcessInstanceVariableDataEvent) event;
+            String name = vars.getData().getVariableName();
+            Object value = vars.getData().getVariableValue();
+            Map<String, Object> newVars = Collections.singletonMap(name, value);
+            LOGGER.debug("Setting domain variable name {} with value {}", name, value);
+            json.putAll((ObjectNode) getObjectMapper().valueToTree(newVars));
+
+        }
+        return json;
+
     }
 
-    private ObjectNode getProcessJson(ProcessInstanceDataEvent event) {
+    private ObjectNode getProcessJson(ProcessInstanceDataEvent<?> event) {
         ObjectNode json = getObjectMapper().createObjectNode();
-        json.put(ID, event.getData().getId());
-        json.put(PROCESS_ID, event.getData().getProcessId());
-        json.put(PROCESS_NAME, event.getData().getProcessName());
-        if (!isNullOrEmpty(event.getData().getRootInstanceId())) {
-            json.put("rootProcessInstanceId", event.getData().getRootInstanceId());
+        json.put(ID, event.getKogitoProcessInstanceId());
+        json.put(PROCESS_ID, event.getKogitoProcessId());
+        json.put(LAST_UPDATE, event.getTime() == null ? null : event.getTime().toInstant().toEpochMilli());
+
+        if (!isNullOrEmpty(event.getKogitoRootProcessInstanceId())) {
+            json.put("rootProcessInstanceId", event.getKogitoRootProcessInstanceId());
         }
-        if (!isNullOrEmpty(event.getData().getParentInstanceId())) {
-            json.put("parentProcessInstanceId", event.getData().getParentInstanceId());
+        if (!isNullOrEmpty(event.getKogitoParentProcessInstanceId())) {
+            json.put("parentProcessInstanceId", event.getKogitoParentProcessInstanceId());
         }
-        if (!isNullOrEmpty(event.getData().getRootProcessId())) {
-            json.put("rootProcessId", event.getData().getRootProcessId());
+        if (!isNullOrEmpty(event.getKogitoRootProcessId())) {
+            json.put("rootProcessId", event.getKogitoRootProcessId());
         }
-        json.put("state", event.getData().getState());
+
         if (event.getSource() != null) {
             json.put("endpoint", event.getSource().toString());
         }
-        if (event.getData().getStartDate() != null) {
-            json.put("start", event.getData().getStartDate().toInstant().toEpochMilli());
-        }
-        if (event.getData().getEndDate() != null) {
-            json.put("end", event.getData().getEndDate().toInstant().toEpochMilli());
-        }
-        json.put(LAST_UPDATE, event.getTime() == null ? null : event.getTime().toInstant().toEpochMilli());
-        if (!isNullOrEmpty(event.getData().getBusinessKey())) {
-            json.put("businessKey", event.getData().getBusinessKey());
-        }
-        if (!isNullOrEmpty(event.getData().getIdentity())) {
-            json.put("updatedBy", event.getData().getIdentity());
+
+        if (event instanceof ProcessInstanceStateDataEvent) {
+            ProcessInstanceStateDataEvent state = (ProcessInstanceStateDataEvent) event;
+
+            json.put("state", state.getData().getState());
+            json.put(PROCESS_NAME, state.getData().getProcessName());
+            if (!isNullOrEmpty(state.getData().getBusinessKey())) {
+                json.put("businessKey", state.getData().getBusinessKey());
+            }
+            if (state.getData().getEventType() != null && state.getData().getEventType() == 1) {
+                json.put("start", state.getData().getEventDate().toInstant().toEpochMilli());
+                if (!isNullOrEmpty(state.getData().getEventUser())) {
+                    json.put("createdBy", state.getData().getEventUser());
+                }
+            }
+            if (state.getData().getEventType() != null && state.getData().getEventType() == 2) {
+                json.put("end", state.getData().getEventDate().toInstant().toEpochMilli());
+            }
+
+            if (!isNullOrEmpty(state.getData().getEventUser())) {
+                json.put("updatedBy", state.getData().getEventUser());
+            }
         }
+
         return json;
     }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapper.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapper.java
index 9a783cafaa..ec8abe1ace 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapper.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapper.java
@@ -1,24 +1,38 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.json;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -31,17 +45,17 @@
 import static org.kie.kogito.index.storage.Constants.PROCESS_ID;
 import static org.kie.kogito.index.storage.Constants.USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE;
 
-public class UserTaskInstanceMetaMapper implements Function<UserTaskInstanceDataEvent, ObjectNode> {
+public class UserTaskInstanceMetaMapper implements Function<UserTaskInstanceDataEvent<?>, ObjectNode> {
 
     @Override
-    public ObjectNode apply(UserTaskInstanceDataEvent event) {
+    public ObjectNode apply(UserTaskInstanceDataEvent<?> event) {
         if (event == null) {
             return null;
         }
 
         ObjectNode json = getObjectMapper().createObjectNode();
-        json.put(ID, isNullOrEmpty(event.getData().getRootProcessInstanceId()) ? event.getData().getProcessInstanceId() : event.getData().getRootProcessInstanceId());
-        json.put(PROCESS_ID, isNullOrEmpty(event.getData().getRootProcessId()) ? event.getData().getProcessId() : event.getData().getRootProcessId());
+        json.put(ID, isNullOrEmpty(event.getKogitoRootProcessInstanceId()) ? event.getKogitoProcessInstanceId() : event.getKogitoRootProcessInstanceId());
+        json.put(PROCESS_ID, isNullOrEmpty(event.getKogitoRootProcessId()) ? event.getKogitoProcessId() : event.getKogitoRootProcessId());
         ObjectNode kogito = getObjectMapper().createObjectNode();
         kogito.put(LAST_UPDATE, event.getTime() == null ? null : event.getTime().toInstant().toEpochMilli());
         kogito.withArray(USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE).add(getUserTaskJson(event));
@@ -49,35 +63,88 @@ public ObjectNode apply(UserTaskInstanceDataEvent event) {
         return json;
     }
 
-    private ObjectNode getUserTaskJson(UserTaskInstanceDataEvent event) {
+    private ObjectNode getUserTaskJson(UserTaskInstanceDataEvent<?> event) {
         ObjectNode json = getObjectMapper().createObjectNode();
-        json.put(ID, event.getData().getId());
-        json.put("processInstanceId", event.getData().getProcessInstanceId());
-        json.put("state", event.getData().getState());
-        if (!isNullOrEmpty(event.getData().getTaskDescription())) {
-            json.put("description", event.getData().getTaskDescription());
-        }
-        if (!isNullOrEmpty(event.getData().getTaskName())) {
-            json.put("name", event.getData().getTaskName());
-        }
-        if (!isNullOrEmpty(event.getData().getTaskPriority())) {
-            json.put("priority", event.getData().getTaskPriority());
-        }
-        if (!isNullOrEmpty(event.getData().getActualOwner())) {
-            json.put("actualOwner", event.getData().getActualOwner());
-        }
-        mapArray("adminUsers", event.getData().getAdminUsers(), json);
-        mapArray("adminGroups", event.getData().getAdminGroups(), json);
-        mapArray("excludedUsers", event.getData().getExcludedUsers(), json);
-        mapArray("potentialGroups", event.getData().getPotentialGroups(), json);
-        mapArray("potentialUsers", event.getData().getPotentialUsers(), json);
-        if (event.getData().getCompleteDate() != null) {
-            json.put("completed", event.getData().getCompleteDate().toInstant().toEpochMilli());
-        }
-        if (event.getData().getStartDate() != null) {
-            json.put("started", event.getData().getStartDate().toInstant().toEpochMilli());
-        }
+        json.put(ID, event.getKogitoUserTaskInstanceId());
+        json.put("processInstanceId", event.getKogitoProcessInstanceId());
+        json.put("state", event.getKogitoUserTaskInstanceState());
         json.put(LAST_UPDATE, event.getTime() == null ? null : event.getTime().toInstant().toEpochMilli());
+
+        if (event instanceof UserTaskInstanceStateDataEvent) {
+
+            UserTaskInstanceStateDataEvent data = (UserTaskInstanceStateDataEvent) event;
+            json.put("actualOwner", data.getData().getActualOwner());
+
+            if (!isNullOrEmpty(data.getData().getUserTaskDescription())) {
+                json.put("description", data.getData().getUserTaskDescription());
+            }
+            if (!isNullOrEmpty(data.getData().getUserTaskName())) {
+                json.put("name", data.getData().getUserTaskName());
+            }
+            if (!isNullOrEmpty(data.getData().getUserTaskPriority())) {
+                json.put("priority", data.getData().getUserTaskPriority());
+            }
+
+            if (data.getData().getState() != null && data.getData().getState().equals("Completed")) {
+                json.put("completed", data.getData().getEventDate().toInstant().toEpochMilli());
+            }
+            List<String> events = List.of("Ready", "InProgress");
+            if (data.getData().getState() != null && events.contains(data.getData().getState())) {
+                json.put("started", data.getData().getEventDate().toInstant().toEpochMilli());
+            }
+        } else if (event instanceof UserTaskInstanceAssignmentDataEvent) {
+            UserTaskInstanceAssignmentDataEvent data = (UserTaskInstanceAssignmentDataEvent) event;
+            UserTaskInstanceAssignmentEventBody body = data.getData();
+            switch (body.getAssignmentType()) {
+                case "USER_OWNERS":
+                    mapArray("potentialUsers", new HashSet<>(body.getUsers()), json);
+                    break;
+                case "USER_GROUPS":
+                    mapArray("potentialGroups", new HashSet<>(body.getUsers()), json);
+                    break;
+                case "USERS_EXCLUDED":
+                    mapArray("excludedUsers", new HashSet<>(body.getUsers()), json);
+                    break;
+                case "ADMIN_GROUPS":
+                    mapArray("adminUsers", new HashSet<>(body.getUsers()), json);
+                    break;
+                case "ADMIN_USERS":
+                    mapArray("adminGroups", new HashSet<>(body.getUsers()), json);
+                    break;
+            }
+
+        } else if (event instanceof UserTaskInstanceAttachmentDataEvent) {
+            UserTaskInstanceAttachmentDataEvent data = (UserTaskInstanceAttachmentDataEvent) event;
+            UserTaskInstanceAttachmentEventBody body = data.getData();
+            Map<String, Object> attachment = new HashMap<>();
+            attachment.put("id", body.getAttachmentId());
+            attachment.put("name", body.getAttachmentName());
+            attachment.put("content", body.getAttachmentURI() != null ? body.getAttachmentURI().toString() : "");
+            attachment.put("updatedBy", body.getEventUser());
+            attachment.put("updatedAt", body.getEventDate());
+
+            if (body.getEventType() == UserTaskInstanceAttachmentEventBody.EVENT_TYPE_DELETED) {
+                attachment.put("remove", true);
+            }
+
+            ArrayNode arrayNode = json.withArray("attachments");
+            arrayNode.add(getObjectMapper().valueToTree(attachment));
+
+        } else if (event instanceof UserTaskInstanceCommentDataEvent) {
+            UserTaskInstanceCommentDataEvent data = (UserTaskInstanceCommentDataEvent) event;
+            UserTaskInstanceCommentEventBody body = data.getData();
+            Map<String, Object> comment = new HashMap<>();
+            comment.put("id", body.getCommentId());
+            comment.put("content", body.getCommentContent());
+            comment.put("updatedBy", body.getEventUser());
+            comment.put("updatedAt", body.getEventDate());
+            if (body.getEventType() == UserTaskInstanceCommentEventBody.EVENT_TYPE_DELETED) {
+                comment.put("remove", true);
+            }
+            ArrayNode arrayNode = json.withArray("comments");
+            arrayNode.add(getObjectMapper().valueToTree(comment));
+        }
+
         return json;
     }
 
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
index ab2c229609..074534277c 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.messaging;
 
@@ -22,11 +25,10 @@
 
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.kie.kogito.event.DataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
-import org.kie.kogito.index.event.ProcessInstanceEventMapper;
-import org.kie.kogito.index.event.UserTaskInstanceEventMapper;
 import org.kie.kogito.index.service.IndexingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,8 +36,10 @@
 import io.quarkus.arc.properties.IfBuildProperty;
 import io.smallrye.reactive.messaging.annotations.Blocking;
 
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.*;
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESS_DEFINITIONS_EVENTS;
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
 
 @ApplicationScoped
@@ -45,7 +49,7 @@ public class BlockingMessagingEventConsumer {
     private static final Logger LOGGER = LoggerFactory.getLogger(BlockingMessagingEventConsumer.class);
 
     @Inject
-    Event<DataEvent> eventPublisher;
+    Event<DataEvent<?>> eventPublisher;
 
     @Inject
     IndexingService indexingService;
@@ -53,18 +57,18 @@ public class BlockingMessagingEventConsumer {
     @Incoming(KOGITO_PROCESSINSTANCES_EVENTS)
     @Blocking
     @Transactional
-    public void onProcessInstanceEvent(ProcessInstanceDataEvent event) {
+    public void onProcessInstanceEvent(ProcessInstanceDataEvent<?> event) {
         LOGGER.debug("Process instance consumer received ProcessInstanceDataEvent: \n{}", event);
-        indexingService.indexProcessInstance(new ProcessInstanceEventMapper().apply(event));
+        indexingService.indexProcessInstanceEvent(event);
         eventPublisher.fire(event);
     }
 
     @Incoming(KOGITO_USERTASKINSTANCES_EVENTS)
     @Blocking
     @Transactional
-    public void onUserTaskInstanceEvent(UserTaskInstanceDataEvent event) {
+    public void onUserTaskInstanceEvent(UserTaskInstanceDataEvent<?> event) {
         LOGGER.debug("Task instance received UserTaskInstanceDataEvent \n{}", event);
-        indexingService.indexUserTaskInstance(new UserTaskInstanceEventMapper().apply(event));
+        indexingService.indexUserTaskInstanceEvent(event);
         eventPublisher.fire(event);
     }
 
@@ -76,4 +80,11 @@ public void onJobEvent(KogitoJobCloudEvent event) {
         indexingService.indexJob(event.getData());
     }
 
+    @Incoming(KOGITO_PROCESS_DEFINITIONS_EVENTS)
+    @Blocking
+    @Transactional
+    public void onProcessDefinitionDataEvent(ProcessDefinitionDataEvent event) {
+        LOGGER.debug("Job received KogitoJobCloudEvent \n{}", event);
+        indexingService.indexProcessDefinition(event);
+    }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
index 16be6bcffe..39bfb2574b 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -23,7 +25,7 @@
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.event.DataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.service.IndexingService;
 import org.kie.kogito.index.service.json.ProcessInstanceMetaMapper;
 import org.kie.kogito.index.service.json.UserTaskInstanceMetaMapper;
@@ -48,7 +50,7 @@ public class DomainEventConsumer {
     @Inject
     IndexingService indexingService;
 
-    public void onDomainEvent(@Observes DataEvent event) {
+    public void onDomainEvent(@Observes DataEvent<?> event) {
         if (!indexDomain) {
             return;
         }
@@ -57,12 +59,12 @@ public void onDomainEvent(@Observes DataEvent event) {
         indexingService.indexModel(getDomainData(event));
     }
 
-    private ObjectNode getDomainData(DataEvent event) {
+    private ObjectNode getDomainData(DataEvent<?> event) {
         if (event instanceof ProcessInstanceDataEvent) {
-            return new ProcessInstanceMetaMapper().apply((ProcessInstanceDataEvent) event);
+            return new ProcessInstanceMetaMapper().apply((ProcessInstanceDataEvent<?>) event);
         }
         if (event instanceof UserTaskInstanceDataEvent) {
-            return new UserTaskInstanceMetaMapper().apply((UserTaskInstanceDataEvent) event);
+            return new UserTaskInstanceMetaMapper().apply((UserTaskInstanceDataEvent<?>) event);
         }
         throw new IllegalArgumentException(
                 format("Unknown message type: '%s' for event class: '%s'", event.getType(), event.getClass().getName()));
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
index e75147bab8..54c2895b7a 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
@@ -1,31 +1,59 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.messaging;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.util.function.Supplier;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
+import org.kie.kogito.event.AbstractDataEvent;
+import org.kie.kogito.event.DataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionEventBody;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.ProcessInstanceEventBody;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceEventBody;
+import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceErrorEventBody;
+import org.kie.kogito.event.process.ProcessInstanceNodeDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceNodeEventBody;
+import org.kie.kogito.event.process.ProcessInstanceSLADataEvent;
+import org.kie.kogito.event.process.ProcessInstanceSLAEventBody;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateEventBody;
+import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceVariableEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceVariableDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceVariableEventBody;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
 import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.service.DataIndexServiceException;
@@ -34,7 +62,12 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.cloudevents.CloudEvent;
+import io.cloudevents.core.message.MessageReader;
+import io.cloudevents.http.vertx.VertxMessageFactory;
+import io.quarkus.reactivemessaging.http.runtime.IncomingHttpMetadata;
 import io.smallrye.reactive.messaging.MessageConverter;
+import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
 
 /**
@@ -56,6 +89,7 @@ public boolean canConvert(Message<?> message, Type type) {
 
     private boolean isIndexable(Type type) {
         return type == ProcessInstanceDataEvent.class
+                || type == ProcessDefinitionDataEvent.class
                 || type == UserTaskInstanceDataEvent.class
                 || type == KogitoJobCloudEvent.class;
     }
@@ -63,34 +97,119 @@ private boolean isIndexable(Type type) {
     @Override
     public Message<?> convert(Message<?> message, Type type) {
         try {
+            // quarkus-http connector case, let Vertx manage binary and structured mode.
+            IncomingHttpMetadata httpMetadata = message.getMetadata(IncomingHttpMetadata.class)
+                    .orElseThrow(() -> new IllegalStateException("No IncomingHttpMetadata metadata was found current message."));
+            CloudEvent cloudEvent;
+            MultiMap httpHeaders = httpMetadata.getHeaders();
+            Buffer buffer = (Buffer) message.getPayload();
+            MessageReader messageReader = VertxMessageFactory.createReader(httpHeaders, buffer);
+            cloudEvent = messageReader.toEvent();
+
             if (type.getTypeName().equals(ProcessInstanceDataEvent.class.getTypeName())) {
-                ProcessInstanceDataEvent processInstanceDataEvent = objectMapper.readValue(message.getPayload().toString(), ProcessInstanceDataEvent.class);
-                if (processInstanceDataEvent.getData() == null) {
-                    processInstanceDataEvent.setData(objectMapper.readValue(message.getPayload().toString(), ProcessInstanceEventBody.class));
-                }
-                return message.withPayload(processInstanceDataEvent);
+                return message.withPayload(buildProcessInstanceDataEventVariant(cloudEvent));
             } else if (type.getTypeName().equals(KogitoJobCloudEvent.class.getTypeName())) {
-                KogitoJobCloudEvent event = objectMapper.readValue(message.getPayload().toString(), KogitoJobCloudEvent.class);
-                if (event.getData() == null) {
-                    event.setData(objectMapper.readValue(message.getPayload().toString(), Job.class));
-                }
-                return message.withPayload(event);
+                return message.withPayload(buildKogitoJobCloudEvent(cloudEvent));
             } else if (type.getTypeName().equals(UserTaskInstanceDataEvent.class.getTypeName())) {
-                UserTaskInstanceDataEvent userTaskInstanceDataEvent = objectMapper.readValue(message.getPayload().toString(), UserTaskInstanceDataEvent.class);
-                if (userTaskInstanceDataEvent.getData() == null) {
-                    userTaskInstanceDataEvent.setData(objectMapper.readValue(message.getPayload().toString(), UserTaskInstanceEventBody.class));
-                }
-                return message.withPayload(userTaskInstanceDataEvent);
+                return message.withPayload(buildUserTaskInstanceDataEvent(cloudEvent));
+            } else if (type.getTypeName().equals(ProcessDefinitionDataEvent.class.getTypeName())) {
+                return message.withPayload(buildProcessDefinitionEvent(cloudEvent));
             }
-            return message;
+            // never happens, see isIndexable.
+            throw new IllegalArgumentException("Unknown event type: " + type);
         } catch (IOException e) {
             LOGGER.error("Error converting message payload to " + type.getTypeName(), e);
             throw new DataIndexServiceException("Error converting message payload:\n" + message.getPayload() + " \n to" + type.getTypeName(), e);
         }
     }
 
+    private ProcessDefinitionDataEvent buildProcessDefinitionEvent(CloudEvent cloudEvent) throws IOException {
+        ProcessDefinitionDataEvent event = new ProcessDefinitionDataEvent();
+        applyCloudEventAttributes(cloudEvent, event);
+        if (cloudEvent.getData() != null) {
+            event.setData(objectMapper.readValue(cloudEvent.getData().toBytes(), ProcessDefinitionEventBody.class));
+        }
+        return event;
+    }
+
     @Inject
     public void setObjectMapper(ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
+
+    private DataEvent<?> buildProcessInstanceDataEventVariant(CloudEvent cloudEvent) throws IOException {
+        switch (cloudEvent.getType()) {
+            case "ProcessInstanceErrorDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, ProcessInstanceErrorDataEvent::new, ProcessInstanceErrorEventBody.class);
+            case "ProcessInstanceNodeDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, ProcessInstanceNodeDataEvent::new, ProcessInstanceNodeEventBody.class);
+            case "ProcessInstanceSLADataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, ProcessInstanceSLADataEvent::new, ProcessInstanceSLAEventBody.class);
+            case "ProcessInstanceStateDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, ProcessInstanceStateDataEvent::new, ProcessInstanceStateEventBody.class);
+            case "ProcessInstanceVariableDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, ProcessInstanceVariableDataEvent::new, ProcessInstanceVariableEventBody.class);
+            default:
+                throw new IllegalArgumentException("Unknown ProcessInstanceDataEvent variant: " + cloudEvent.getType());
+        }
+    }
+
+    private DataEvent<?> buildUserTaskInstanceDataEvent(CloudEvent cloudEvent) throws IOException {
+        switch (cloudEvent.getType()) {
+            case "UserTaskInstanceAssignmentDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, UserTaskInstanceAssignmentDataEvent::new, UserTaskInstanceAssignmentEventBody.class);
+            case "UserTaskInstanceAttachmentDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, UserTaskInstanceAttachmentDataEvent::new, UserTaskInstanceAttachmentEventBody.class);
+            case "UserTaskInstanceCommentDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, UserTaskInstanceCommentDataEvent::new, UserTaskInstanceCommentEventBody.class);
+            case "UserTaskInstanceDeadlineDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, UserTaskInstanceDeadlineDataEvent::new, UserTaskInstanceDeadlineEventBody.class);
+            case "UserTaskInstanceStateDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, UserTaskInstanceStateDataEvent::new, UserTaskInstanceStateEventBody.class);
+            case "UserTaskInstanceVariableDataEvent":
+                return buildDataEvent(cloudEvent, objectMapper, UserTaskInstanceVariableDataEvent::new, UserTaskInstanceVariableEventBody.class);
+            default:
+                throw new IllegalArgumentException("Unknown UserTaskInstanceDataEvent variant: " + cloudEvent.getType());
+        }
+    }
+
+    private KogitoJobCloudEvent buildKogitoJobCloudEvent(CloudEvent cloudEvent) throws IOException {
+        KogitoJobCloudEvent jobCloudEvent = new KogitoJobCloudEvent();
+        jobCloudEvent.setId(cloudEvent.getId());
+        jobCloudEvent.setType(cloudEvent.getType());
+        jobCloudEvent.setSource(cloudEvent.getSource());
+        jobCloudEvent.setContentType(cloudEvent.getDataContentType());
+        jobCloudEvent.setSchemaURL(cloudEvent.getDataSchema());
+        jobCloudEvent.setSubject(cloudEvent.getSubject());
+        jobCloudEvent.setTime(cloudEvent.getTime() != null ? cloudEvent.getTime().toZonedDateTime() : null);
+        if (cloudEvent.getData() != null) {
+            jobCloudEvent.setData(objectMapper.readValue(cloudEvent.getData().toBytes(), Job.class));
+        }
+        return jobCloudEvent;
+    }
+
+    private static <E extends AbstractDataEvent<T>, T> E buildDataEvent(CloudEvent cloudEvent, ObjectMapper objectMapper, Supplier<E> supplier, Class<T> clazz) throws IOException {
+        E dataEvent = supplier.get();
+        applyCloudEventAttributes(cloudEvent, dataEvent);
+        applyExtensions(cloudEvent, dataEvent);
+        if (cloudEvent.getData() != null) {
+            dataEvent.setData(objectMapper.readValue(cloudEvent.getData().toBytes(), clazz));
+        }
+        return dataEvent;
+    }
+
+    private static void applyCloudEventAttributes(CloudEvent cloudEvent, AbstractDataEvent<?> dataEvent) {
+        dataEvent.setSpecVersion(cloudEvent.getSpecVersion());
+        dataEvent.setId(cloudEvent.getId());
+        dataEvent.setType(cloudEvent.getType());
+        dataEvent.setSource(cloudEvent.getSource());
+        dataEvent.setDataContentType(cloudEvent.getDataContentType());
+        dataEvent.setDataSchema(cloudEvent.getDataSchema());
+        dataEvent.setSubject(cloudEvent.getSubject());
+        dataEvent.setTime(cloudEvent.getTime());
+    }
+
+    private static void applyExtensions(CloudEvent cloudEvent, AbstractDataEvent<?> dataEvent) {
+        cloudEvent.getExtensionNames().forEach(extensionName -> dataEvent.addExtensionAttribute(extensionName, cloudEvent.getExtension(extensionName)));
+    }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ProcessInstanceDataEventDeserializer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ProcessInstanceDataEventDeserializer.java
new file mode 100644
index 0000000000..760691473d
--- /dev/null
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ProcessInstanceDataEventDeserializer.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.service.messaging;
+
+import org.apache.kafka.common.serialization.Deserializer;
+import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.index.json.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+public class ProcessInstanceDataEventDeserializer implements Deserializer<ProcessInstanceDataEvent<?>> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessInstanceDataEventDeserializer.class);
+
+    @Override
+    public ProcessInstanceDataEvent<?> deserialize(String topic, byte[] data) {
+        try {
+            return JsonUtils.getObjectMapper().readValue(new String(data), ProcessInstanceDataEvent.class);
+        } catch (JsonProcessingException e) {
+            LOGGER.error("not possible to deserialize ProcessInstanceDataEvent data {}", new String(data), e);
+            throw new IllegalArgumentException("not possible to deserialize data");
+        }
+
+    }
+
+}
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
index c86ff60364..55271b7fa8 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.messaging;
 
@@ -21,11 +24,10 @@
 
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.kie.kogito.event.DataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
-import org.kie.kogito.index.event.ProcessInstanceEventMapper;
-import org.kie.kogito.index.event.UserTaskInstanceEventMapper;
 import org.kie.kogito.index.service.IndexingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +42,7 @@ public class ReactiveMessagingEventConsumer {
     private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveMessagingEventConsumer.class);
 
     public static final String KOGITO_PROCESSINSTANCES_EVENTS = "kogito-processinstances-events";
+    public static final String KOGITO_PROCESS_DEFINITIONS_EVENTS = "kogito-processdefinitions-events";
     public static final String KOGITO_USERTASKINSTANCES_EVENTS = "kogito-usertaskinstances-events";
     public static final String KOGITO_JOBS_EVENTS = "kogito-jobs-events";
 
@@ -47,25 +50,25 @@ public class ReactiveMessagingEventConsumer {
     IndexingService indexingService;
 
     @Inject
-    Event<DataEvent> eventPublisher;
+    Event<DataEvent<?>> eventPublisher;
 
     @Incoming(KOGITO_PROCESSINSTANCES_EVENTS)
-    public Uni<Void> onProcessInstanceEvent(ProcessInstanceDataEvent event) {
+    public Uni<Void> onProcessInstanceEvent(ProcessInstanceDataEvent<?> event) {
         LOGGER.debug("Process instance consumer received ProcessInstanceDataEvent: \n{}", event);
         return Uni.createFrom().item(event)
-                .invoke(e -> indexingService.indexProcessInstance(new ProcessInstanceEventMapper().apply(e)))
-                .invoke(e -> eventPublisher.fire(e))
+                .invoke(indexingService::indexProcessInstanceEvent)
+                .invoke(eventPublisher::fire)
                 .onFailure()
                 .invoke(t -> LOGGER.error("Error processing process instance ProcessInstanceDataEvent: {}", t.getMessage(), t))
                 .onItem().ignore().andContinueWithNull();
     }
 
     @Incoming(KOGITO_USERTASKINSTANCES_EVENTS)
-    public Uni<Void> onUserTaskInstanceEvent(UserTaskInstanceDataEvent event) {
+    public Uni<Void> onUserTaskInstanceEvent(UserTaskInstanceDataEvent<?> event) {
         LOGGER.debug("Task instance received UserTaskInstanceDataEvent \n{}", event);
         return Uni.createFrom().item(event)
-                .invoke(e -> indexingService.indexUserTaskInstance(new UserTaskInstanceEventMapper().apply(e)))
-                .invoke(e -> eventPublisher.fire(e))
+                .invoke(indexingService::indexUserTaskInstanceEvent)
+                .invoke(eventPublisher::fire)
                 .onFailure()
                 .invoke(t -> LOGGER.error("Error processing task instance UserTaskInstanceDataEvent: {}", t.getMessage(), t))
                 .onItem().ignore().andContinueWithNull();
@@ -80,4 +83,12 @@ public Uni<Void> onJobEvent(KogitoJobCloudEvent event) {
                 .onItem().ignore().andContinueWithNull();
     }
 
+    @Incoming(KOGITO_PROCESS_DEFINITIONS_EVENTS)
+    public Uni<Void> onProcessDefinitionDataEvent(ProcessDefinitionDataEvent event) {
+        LOGGER.debug("Process Definition received ProcessDefinitionDataEvent \n{}", event);
+        return Uni.createFrom().item(event)
+                .onItem().invoke(indexingService::indexProcessDefinition)
+                .onFailure().invoke(t -> LOGGER.error("Error processing ProcessDefinitionDataEvent: {}", t.getMessage(), t))
+                .onItem().ignore().andContinueWithNull();
+    }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/UserTaskInstanceDataEventDeserializer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/UserTaskInstanceDataEventDeserializer.java
new file mode 100644
index 0000000000..a385707507
--- /dev/null
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/UserTaskInstanceDataEventDeserializer.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.service.messaging;
+
+import org.apache.kafka.common.serialization.Deserializer;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.index.json.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+public class UserTaskInstanceDataEventDeserializer implements Deserializer<UserTaskInstanceDataEvent<?>> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UserTaskInstanceDataEventDeserializer.class);
+
+    @Override
+    public UserTaskInstanceDataEvent<?> deserialize(String topic, byte[] data) {
+        try {
+            return JsonUtils.getObjectMapper().readValue(new String(data), UserTaskInstanceDataEvent.class);
+        } catch (JsonProcessingException e) {
+            LOGGER.error("not possible to deserialize UserTaskInstanceDataEvent data {}", new String(data), e);
+            throw new IllegalArgumentException("not possible to deserialize data");
+        }
+
+    }
+
+}
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
index a1cff2facf..a18e6a8bf2 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.vertx;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/beans.xml b/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties b/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties
index bce555b749..15ec93572e 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties
+++ b/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Quarkus
 quarkus.log.level=INFO
 quarkus.log.console.enable=true
@@ -44,13 +63,19 @@ kogito.data-index.vertx-graphql.ui.tenant=web-app-tenant
 
 mp.messaging.incoming.kogito-processinstances-events.connector=quarkus-http
 mp.messaging.incoming.kogito-processinstances-events.path=/processes
+mp.messaging.incoming.kogito-processdefinitions-events.connector=quarkus-http
+mp.messaging.incoming.kogito-processdefinitions-events.path=/definitions
 mp.messaging.incoming.kogito-usertaskinstances-events.connector=quarkus-http
 mp.messaging.incoming.kogito-usertaskinstances-events.path=/tasks
 mp.messaging.incoming.kogito-jobs-events.connector=quarkus-http
 mp.messaging.incoming.kogito-jobs-events.path=/jobs
 
 %kafka-events-support.mp.messaging.incoming.kogito-processinstances-events.connector=smallrye-kafka
+%kafka-events-support.mp.messaging.incoming.kogito-processinstances-events.value.deserializer=org.kie.kogito.index.service.messaging.ProcessInstanceDataEventDeserializer
+%kafka-events-support.mp.messaging.incoming.kogito-processdefinitions-events.connector=smallrye-kafka
+
 %kafka-events-support.mp.messaging.incoming.kogito-usertaskinstances-events.connector=smallrye-kafka
+%kafka-events-support.mp.messaging.incoming.kogito-usertaskinstances-events.value.deserializer=org.kie.kogito.index.service.messaging.UserTaskInstanceDataEventDeserializer
 %kafka-events-support.mp.messaging.incoming.kogito-jobs-events.connector=smallrye-kafka
 %kafka-events-support.quarkus.kafka.bootstrap-servers=localhost:9092
 %kafka-events-support.kafka.bootstrap.servers=localhost:9092
@@ -61,6 +86,12 @@ mp.messaging.incoming.kogito-processinstances-events.enable.auto.commit=false
 mp.messaging.incoming.kogito-processinstances-events.auto.offset.reset=earliest
 mp.messaging.incoming.kogito-processinstances-events.isolation.level=read_committed
 
+mp.messaging.incoming.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.incoming.kogito-processdefinitions-events.group.id=kogito-data-index-process-definitions
+mp.messaging.incoming.kogito-processdefinitions-events.enable.auto.commit=false
+mp.messaging.incoming.kogito-processdefinitions-events.auto.offset.reset=earliest
+mp.messaging.incoming.kogito-processdefinitions-events.isolation.level=read_committed
+
 mp.messaging.incoming.kogito-usertaskinstances-events.topic=kogito-usertaskinstances-events
 mp.messaging.incoming.kogito-usertaskinstances-events.group.id=kogito-data-index-usertaskinstances
 mp.messaging.incoming.kogito-usertaskinstances-events.enable.auto.commit=false
@@ -74,5 +105,6 @@ mp.messaging.incoming.kogito-jobs-events.auto.offset.reset=earliest
 mp.messaging.incoming.kogito-jobs-events.isolation.level=read_committed
 
 %http-events-support.mp.messaging.incoming.kogito-processinstances-events.connector=quarkus-http
+%http-events-support.mp.messaging.incoming.kogito-processdefinitions-events.connector=quarkus-http
 %http-events-support.mp.messaging.incoming.kogito-usertaskinstances-events.connector=quarkus-http
 %http-events-support.mp.messaging.incoming.kogito-jobs-events.connector=quarkus-http
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
index c0ae3af80e..8ef52ccc61 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service;
 
@@ -24,11 +27,12 @@
 
 import javax.inject.Inject;
 
-import org.apache.groovy.util.Maps;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateEventBody;
 import org.kie.kogito.index.test.TestUtils;
 import org.kie.kogito.persistence.protobuf.ProtobufService;
 
@@ -38,26 +42,22 @@
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.hamcrest.CoreMatchers.anyOf;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.CoreMatchers.anything;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.isA;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.kie.kogito.index.DateTimeUtils.formatDateTime;
-import static org.kie.kogito.index.DateTimeUtils.formatOffsetDateTime;
 import static org.kie.kogito.index.model.ProcessInstanceState.ACTIVE;
 import static org.kie.kogito.index.model.ProcessInstanceState.COMPLETED;
-import static org.kie.kogito.index.model.ProcessInstanceState.ERROR;
 import static org.kie.kogito.index.service.GraphQLUtils.getDealsByTaskId;
-import static org.kie.kogito.index.service.GraphQLUtils.getDealsByTaskIdNoActualOwner;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceById;
-import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndErrorNode;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndState;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByParentProcessInstanceId;
 import static org.kie.kogito.index.service.GraphQLUtils.getTravelsByProcessInstanceId;
 import static org.kie.kogito.index.service.GraphQLUtils.getTravelsByUserTaskId;
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceById;
-import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndActualOwner;
-import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdNoActualOwner;
+import static org.kie.kogito.index.test.TestUtils.deriveProcessVariableCloudEvent;
 import static org.kie.kogito.index.test.TestUtils.getProcessCloudEvent;
 import static org.kie.kogito.index.test.TestUtils.getProcessInstanceVariablesMap;
 import static org.kie.kogito.index.test.TestUtils.getUserTaskCloudEvent;
@@ -176,9 +176,13 @@ void testAddProtoFile() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Travels", isA(Collection.class));
 
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
         indexProcessCloudEvent(startEvent);
 
+        for (Map.Entry<String, Object> entry : getProcessInstanceVariablesMap().entrySet()) {
+            indexProcessCloudEvent(deriveProcessVariableCloudEvent(startEvent, entry.getKey(), entry.getValue()));
+        }
+
         validateProcessInstance(getProcessInstanceByIdAndState(processInstanceId, ACTIVE), startEvent);
 
         given().contentType(ContentType.JSON)
@@ -187,7 +191,7 @@ void testAddProtoFile() throws Exception {
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
                 .body("data.Travels[0].__typename", is("Travels"))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(startEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(1))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -195,21 +199,24 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(startEvent.getData().getStartDate())))
+                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(startEvent.getData().getEventDate())))
                 .body("data.Travels[0].metadata.processInstances[0].end", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(startEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(startEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"))
                 .body("data.Travels[0].traveller.firstName", is("Maciej"))
                 .body("data.Travels[0].hotel.name", is("Meriton"))
                 .body("data.Travels[0].flight.flightNumber", is("MX555"));
 
-        ProcessInstanceDataEvent subProcessStartEvent = getProcessCloudEvent(subProcessId, subProcessInstanceId, ACTIVE,
+        ProcessInstanceStateDataEvent subProcessStartEvent = getProcessCloudEvent(subProcessId, subProcessInstanceId, ACTIVE,
                 processInstanceId, processId, processInstanceId, "currentUser");
+        indexProcessCloudEvent(subProcessStartEvent);
+
         Map<String, Object> travellerMap = new HashMap<>();
         travellerMap.put("firstName", "Maciej");
         travellerMap.put("email", "mail@mail.com");
         travellerMap.put("nationality", "Polish");
+
         Map<String, Object> location1Map = new HashMap<>();
         location1Map.put("street", "street1");
         location1Map.put("city", "city1");
@@ -224,8 +231,8 @@ void testAddProtoFile() throws Exception {
 
         travellerMap.put("locations", asList(location1Map, location2Map));
         travellerMap.put("aliases", asList("alias1", "alias2"));
-        subProcessStartEvent.getData().update().variables(Maps.of("traveller", travellerMap));
-        indexProcessCloudEvent(subProcessStartEvent);
+
+        indexProcessCloudEvent(deriveProcessVariableCloudEvent(subProcessStartEvent, "traveller", travellerMap));
 
         validateProcessInstance(getProcessInstanceByIdAndState(subProcessInstanceId, ACTIVE), subProcessStartEvent);
         validateProcessInstance(getProcessInstanceByIdAndState(processInstanceId, ACTIVE), startEvent, subProcessInstanceId);
@@ -236,7 +243,7 @@ void testAddProtoFile() throws Exception {
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
                 .body("data.Travels[0].__typename", is("Travels"))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(subProcessStartEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(2))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -244,9 +251,9 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(startEvent.getData().getStartDate())))
+                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(startEvent.getData().getEventDate())))
                 .body("data.Travels[0].metadata.processInstances[0].end", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(startEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(startEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"))
                 .body("data.Travels[0].metadata.processInstances[1].id", is(subProcessInstanceId))
@@ -255,7 +262,7 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[1].rootProcessId", is(processId))
                 .body("data.Travels[0].metadata.processInstances[1].rootProcessInstanceId", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[1].parentProcessInstanceId", is(processInstanceId))
-                .body("data.Travels[0].metadata.processInstances[1].start", is(formatDateTime(subProcessStartEvent.getData().getStartDate())))
+                .body("data.Travels[0].metadata.processInstances[1].start", is(formatDateTime(subProcessStartEvent.getData().getEventDate())))
                 .body("data.Travels[0].metadata.processInstances[1].end", is(nullValue()))
                 .body("data.Travels[0].traveller.firstName", is("Maciej"))
                 .body("data.Travels[0].traveller.email", is("mail@mail.com"))
@@ -271,12 +278,13 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].flight.arrival", is("2019-08-20T22:12:57.34Z"))
                 .body("data.Travels[0].flight.departure", is("2019-08-20T07:12:57.34Z"));
 
-        ProcessInstanceDataEvent endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, "currentUser");
+        ProcessInstanceStateDataEvent endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, "currentUser");
+
         indexProcessCloudEvent(endEvent);
 
         validateProcessInstance(getProcessInstanceByIdAndState(processInstanceId, COMPLETED), endEvent, subProcessInstanceId);
 
-        UserTaskInstanceDataEvent firstUserTaskEvent = getUserTaskCloudEvent(firstTaskId, subProcessId, subProcessInstanceId,
+        UserTaskInstanceStateDataEvent firstUserTaskEvent = getUserTaskCloudEvent(firstTaskId, subProcessId, subProcessInstanceId,
                 processInstanceId, processId, state);
 
         indexUserTaskCloudEvent(firstUserTaskEvent);
@@ -289,7 +297,7 @@ void testAddProtoFile() throws Exception {
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
                 .body("data.Travels[0].__typename", is("Travels"))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(firstUserTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks.size()", is(1))
                 .body("data.Travels[0].metadata.userTasks[0].id", is(firstTaskId))
                 .body("data.Travels[0].metadata.userTasks[0].processInstanceId", is(subProcessInstanceId))
@@ -297,7 +305,7 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.userTasks[0].name", is("TaskName"))
                 .body("data.Travels[0].metadata.userTasks[0].priority", is("High"))
                 .body("data.Travels[0].metadata.userTasks[0].actualOwner", is("kogito"))
-                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(firstUserTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(2))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -305,27 +313,22 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(endEvent.getData().getStartDate())))
-                .body("data.Travels[0].metadata.processInstances[0].end", is(formatDateTime(endEvent.getData().getEndDate())))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(endEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].start", anything())
+                .body("data.Travels[0].metadata.processInstances[0].end", anything())
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[1].id", is(subProcessInstanceId))
                 .body("data.Travels[0].metadata.processInstances[1].processId", is(subProcessId))
                 .body("data.Travels[0].metadata.processInstances[1].processName", is(subProcessStartEvent.getData().getProcessName()))
                 .body("data.Travels[0].metadata.processInstances[1].rootProcessId", is(processId))
                 .body("data.Travels[0].metadata.processInstances[1].rootProcessInstanceId", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[1].parentProcessInstanceId", is(processInstanceId))
-                .body("data.Travels[0].metadata.processInstances[1].start", is(formatDateTime(subProcessStartEvent.getData().getStartDate())))
+                .body("data.Travels[0].metadata.processInstances[1].start", is(formatDateTime(subProcessStartEvent.getData().getEventDate())))
                 .body("data.Travels[0].metadata.processInstances[1].end", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[1].endpoint", is(subProcessStartEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[1].serviceUrl", is("http://localhost:8080"))
-                .body("data.Travels[0].metadata.processInstances[1].lastUpdate", is(formatOffsetDateTime(subProcessStartEvent.getTime())))
-                .body("data.Travels[0].traveller.firstName", is("Maciej"))
-                .body("data.Travels[0].hotel.name", is("Meriton"))
-                .body("data.Travels[0].flight.flightNumber", is("MX555"))
-                .body("data.Travels[0].flight.arrival", is("2019-08-20T22:12:57.34Z"))
-                .body("data.Travels[0].flight.departure", is("2019-08-20T07:12:57.34Z"));
+                .body("data.Travels[0].metadata.processInstances[1].lastUpdate", anything());
 
-        UserTaskInstanceDataEvent secondUserTaskEvent = getUserTaskCloudEvent(secondTaskId, processId, processInstanceId, null,
+        UserTaskInstanceStateDataEvent secondUserTaskEvent = getUserTaskCloudEvent(secondTaskId, processId, processInstanceId, null,
                 null, state);
 
         indexUserTaskCloudEvent(secondUserTaskEvent);
@@ -338,7 +341,7 @@ void testAddProtoFile() throws Exception {
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
                 .body("data.Travels[0].__typename", is("Travels"))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(secondUserTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks.size()", is(2))
                 .body("data.Travels[0].metadata.userTasks[0].id", is(firstTaskId))
                 .body("data.Travels[0].metadata.userTasks[0].processInstanceId", is(subProcessInstanceId))
@@ -346,14 +349,14 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.userTasks[0].name", is("TaskName"))
                 .body("data.Travels[0].metadata.userTasks[0].priority", is("High"))
                 .body("data.Travels[0].metadata.userTasks[0].actualOwner", is("kogito"))
-                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(firstUserTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks[1].id", is(secondTaskId))
                 .body("data.Travels[0].metadata.userTasks[1].processInstanceId", is(processInstanceId))
                 .body("data.Travels[0].metadata.userTasks[1].description", is("TaskDescription"))
                 .body("data.Travels[0].metadata.userTasks[1].name", is("TaskName"))
                 .body("data.Travels[0].metadata.userTasks[1].priority", is("High"))
                 .body("data.Travels[0].metadata.userTasks[1].actualOwner", is("kogito"))
-                .body("data.Travels[0].metadata.userTasks[1].lastUpdate", is(formatOffsetDateTime(secondUserTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.userTasks[1].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(2))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -361,9 +364,9 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(endEvent.getData().getStartDate())))
-                .body("data.Travels[0].metadata.processInstances[0].end", is(formatDateTime(endEvent.getData().getEndDate())))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(endEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].start", anything())
+                .body("data.Travels[0].metadata.processInstances[0].end", anything())
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(endEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"))
                 .body("data.Travels[0].metadata.processInstances[1].id", is(subProcessInstanceId))
@@ -372,8 +375,8 @@ void testAddProtoFile() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[1].rootProcessId", is(processId))
                 .body("data.Travels[0].metadata.processInstances[1].rootProcessInstanceId", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[1].parentProcessInstanceId", is(processInstanceId))
-                .body("data.Travels[0].metadata.processInstances[1].start", is(formatDateTime(subProcessStartEvent.getData().getStartDate())))
-                .body("data.Travels[0].metadata.processInstances[1].lastUpdate", is(formatOffsetDateTime(subProcessStartEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[1].start", anything())
+                .body("data.Travels[0].metadata.processInstances[1].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[1].end", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[1].endpoint", is(subProcessStartEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[1].serviceUrl", is("http://localhost:8080"))
@@ -397,7 +400,7 @@ void testIndexingDomainUsingUserTaskEventFirst() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Travels", isA(Collection.class));
 
-        UserTaskInstanceDataEvent userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
+        UserTaskInstanceStateDataEvent userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
         indexUserTaskCloudEvent(userTaskEvent);
 
         given().contentType(ContentType.JSON)
@@ -406,21 +409,19 @@ void testIndexingDomainUsingUserTaskEventFirst() throws Exception {
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
                 .body("data.Travels[0].__typename", is("Travels"))
-                .body("data.Travels[0].flight", is(nullValue()))
-                .body("data.Travels[0].hotel", is(nullValue()))
-                .body("data.Travels[0].traveller", is(nullValue()))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(userTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks.size()", is(1))
                 .body("data.Travels[0].metadata.userTasks[0].id", is(taskId))
                 .body("data.Travels[0].metadata.userTasks[0].processInstanceId", is(processInstanceId))
-                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getTaskDescription()))
-                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getTaskName()))
-                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getTaskPriority()))
+                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getUserTaskDescription()))
+                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getUserTaskName()))
+                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getUserTaskPriority()))
                 .body("data.Travels[0].metadata.userTasks[0].actualOwner", is(userTaskEvent.getData().getActualOwner()))
-                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(userTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances", is(nullValue()));
 
-        ProcessInstanceDataEvent processEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+        ProcessInstanceStateDataEvent processEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(processEvent);
 
         given().contentType(ContentType.JSON)
@@ -429,18 +430,15 @@ void testIndexingDomainUsingUserTaskEventFirst() throws Exception {
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
                 .body("data.Travels[0].__typename", is("Travels"))
-                .body("data.Travels[0].flight.flightNumber", is("MX555"))
-                .body("data.Travels[0].hotel.name", is("Meriton"))
-                .body("data.Travels[0].traveller.firstName", is("Maciej"))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(processEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks.size()", is(1))
                 .body("data.Travels[0].metadata.userTasks[0].id", is(taskId))
                 .body("data.Travels[0].metadata.userTasks[0].processInstanceId", is(processInstanceId))
-                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getTaskDescription()))
-                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getTaskName()))
-                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getTaskPriority()))
+                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getUserTaskDescription()))
+                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getUserTaskName()))
+                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getUserTaskPriority()))
                 .body("data.Travels[0].metadata.userTasks[0].actualOwner", is(userTaskEvent.getData().getActualOwner()))
-                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(userTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(1))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -448,7 +446,7 @@ void testIndexingDomainUsingUserTaskEventFirst() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(processEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(processEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"));
     }
@@ -466,7 +464,8 @@ void testIndexingDomainUsingProcessEventFirst() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Travels", isA(Collection.class));
 
-        ProcessInstanceDataEvent processEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+        ProcessInstanceStateDataEvent processEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(processEvent);
 
         given().contentType(ContentType.JSON)
@@ -474,10 +473,7 @@ void testIndexingDomainUsingProcessEventFirst() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
-                .body("data.Travels[0].flight.flightNumber", is("MX555"))
-                .body("data.Travels[0].hotel.name", is("Meriton"))
-                .body("data.Travels[0].traveller.firstName", is("Maciej"))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(processEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances.size()", is(1))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
@@ -486,11 +482,11 @@ void testIndexingDomainUsingProcessEventFirst() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(processEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(processEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"));
 
-        UserTaskInstanceDataEvent userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
+        UserTaskInstanceStateDataEvent userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
         indexUserTaskCloudEvent(userTaskEvent);
 
         given().contentType(ContentType.JSON)
@@ -498,18 +494,15 @@ void testIndexingDomainUsingProcessEventFirst() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
-                .body("data.Travels[0].flight.flightNumber", is("MX555"))
-                .body("data.Travels[0].hotel.name", is("Meriton"))
-                .body("data.Travels[0].traveller.firstName", is("Maciej"))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(userTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks.size()", is(1))
                 .body("data.Travels[0].metadata.userTasks[0].id", is(taskId))
                 .body("data.Travels[0].metadata.userTasks[0].processInstanceId", is(processInstanceId))
-                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getTaskDescription()))
-                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getTaskName()))
-                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getTaskPriority()))
+                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getUserTaskDescription()))
+                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getUserTaskName()))
+                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getUserTaskPriority()))
                 .body("data.Travels[0].metadata.userTasks[0].actualOwner", is(userTaskEvent.getData().getActualOwner()))
-                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(userTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(1))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -517,7 +510,7 @@ void testIndexingDomainUsingProcessEventFirst() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(processEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(processEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"));
     }
@@ -535,8 +528,12 @@ void testIndexingDomainParallelEvents() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Travels", isA(Collection.class));
 
-        ProcessInstanceDataEvent processEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
-        UserTaskInstanceDataEvent userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
+        ProcessInstanceStateDataEvent processEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+        UserTaskInstanceStateDataEvent userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
+
+        for (Map.Entry<String, Object> entry : getProcessInstanceVariablesMap().entrySet()) {
+            indexProcessCloudEvent(deriveProcessVariableCloudEvent(processEvent, entry.getKey(), entry.getValue()));
+        }
 
         CompletableFuture.allOf(
                 CompletableFuture.runAsync(() -> indexProcessCloudEvent(processEvent)),
@@ -551,15 +548,15 @@ void testIndexingDomainParallelEvents() throws Exception {
                 .body("data.Travels[0].flight.flightNumber", is("MX555"))
                 .body("data.Travels[0].hotel.name", is("Meriton"))
                 .body("data.Travels[0].traveller.firstName", is("Maciej"))
-                .body("data.Travels[0].metadata.lastUpdate", anyOf(asList(is(formatOffsetDateTime(userTaskEvent.getTime())), is((formatOffsetDateTime(processEvent.getTime()))))))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.userTasks.size()", is(1))
                 .body("data.Travels[0].metadata.userTasks[0].id", is(taskId))
                 .body("data.Travels[0].metadata.userTasks[0].processInstanceId", is(processInstanceId))
-                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getTaskDescription()))
-                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getTaskName()))
-                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getTaskPriority()))
+                .body("data.Travels[0].metadata.userTasks[0].description", is(userTaskEvent.getData().getUserTaskDescription()))
+                .body("data.Travels[0].metadata.userTasks[0].name", is(userTaskEvent.getData().getUserTaskName()))
+                .body("data.Travels[0].metadata.userTasks[0].priority", is(userTaskEvent.getData().getUserTaskPriority()))
                 .body("data.Travels[0].metadata.userTasks[0].actualOwner", is(userTaskEvent.getData().getActualOwner()))
-                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(userTaskEvent.getTime())))
+                .body("data.Travels[0].metadata.userTasks[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(1))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -567,7 +564,7 @@ void testIndexingDomainParallelEvents() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(processEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(processEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"));
     }
@@ -585,9 +582,14 @@ void testProcessInstanceDomainIndex() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Travels", isA(Collection.class));
 
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
+        for (Map.Entry<String, Object> entry : getProcessInstanceVariablesMap().entrySet()) {
+            indexProcessCloudEvent(deriveProcessVariableCloudEvent(startEvent, entry.getKey(), entry.getValue()));
+        }
+
         validateProcessInstance(getProcessInstanceById(processInstanceId), startEvent);
 
         given().contentType(ContentType.JSON)
@@ -595,7 +597,7 @@ void testProcessInstanceDomainIndex() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(startEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(1))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -604,8 +606,8 @@ void testProcessInstanceDomainIndex() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].state", is(ACTIVE.name()))
-                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(startEvent.getData().getStartDate())))
-                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", is(formatOffsetDateTime(startEvent.getTime())))
+                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(startEvent.getData().getEventDate())))
+                .body("data.Travels[0].metadata.processInstances[0].lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances[0].end", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(startEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"))
@@ -613,12 +615,15 @@ void testProcessInstanceDomainIndex() throws Exception {
                 .body("data.Travels[0].hotel.name", is("Meriton"))
                 .body("data.Travels[0].traveller.firstName", is("Maciej"));
 
-        ProcessInstanceDataEvent endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, "currentUser");
-        endEvent.getData().update().endDate(new Date());
+        ProcessInstanceStateDataEvent endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, "currentUser");
+
         Map<String, Object> variablesMap = getProcessInstanceVariablesMap();
         ((Map<String, Object>) variablesMap.get("hotel")).put("name", "Ibis");
         ((Map<String, Object>) variablesMap.get("flight")).put("flightNumber", "QF444");
-        endEvent.getData().update().variables(variablesMap);
+
+        for (Map.Entry<String, Object> entry : variablesMap.entrySet()) {
+            indexProcessCloudEvent(deriveProcessVariableCloudEvent(startEvent, entry.getKey(), entry.getValue()));
+        }
 
         indexProcessCloudEvent(endEvent);
 
@@ -629,7 +634,7 @@ void testProcessInstanceDomainIndex() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Travels[0].id", is(processInstanceId))
-                .body("data.Travels[0].metadata.lastUpdate", is(formatOffsetDateTime(endEvent.getTime())))
+                .body("data.Travels[0].metadata.lastUpdate", anything())
                 .body("data.Travels[0].metadata.processInstances.size()", is(1))
                 .body("data.Travels[0].metadata.processInstances[0].id", is(processInstanceId))
                 .body("data.Travels[0].metadata.processInstances[0].processId", is(processId))
@@ -638,27 +643,34 @@ void testProcessInstanceDomainIndex() throws Exception {
                 .body("data.Travels[0].metadata.processInstances[0].rootProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].parentProcessInstanceId", is(nullValue()))
                 .body("data.Travels[0].metadata.processInstances[0].state", is(COMPLETED.name()))
-                .body("data.Travels[0].metadata.processInstances[0].start", is(formatDateTime(endEvent.getData().getStartDate())))
-                .body("data.Travels[0].metadata.processInstances[0].end", is(formatDateTime(endEvent.getData().getEndDate())))
+                .body("data.Travels[0].metadata.processInstances[0].start", anything())
+                .body("data.Travels[0].metadata.processInstances[0].end", anything())
                 .body("data.Travels[0].metadata.processInstances[0].endpoint", is(endEvent.getSource().toString()))
                 .body("data.Travels[0].metadata.processInstances[0].serviceUrl", is("http://localhost:8080"))
                 .body("data.Travels[0].flight.flightNumber", is("QF444"))
                 .body("data.Travels[0].hotel.name", is("Ibis"))
                 .body("data.Travels[0].traveller.firstName", is("Maciej"));
 
-        ProcessInstanceDataEvent event = getProcessCloudEvent(subProcessId, subProcessInstanceId, ACTIVE, processInstanceId,
+        ProcessInstanceStateDataEvent event = getProcessCloudEvent(subProcessId, subProcessInstanceId, ACTIVE, processInstanceId,
                 processId, processInstanceId, "currentUser");
+
         indexProcessCloudEvent(event);
 
         validateProcessInstance(getProcessInstanceByParentProcessInstanceId(processInstanceId), event);
 
-        ProcessInstanceDataEvent errorEvent = getProcessCloudEvent(subProcessId, subProcessInstanceId, ERROR, processInstanceId,
-                processId, processInstanceId, "currentUser");
+        ProcessInstanceErrorDataEvent errorEvent = TestUtils.deriveErrorProcessCloudEvent(event, "error", "nodeDefintionId", "nodeInstanceId");
+
         indexProcessCloudEvent(errorEvent);
 
-        validateProcessInstance(
-                getProcessInstanceByIdAndErrorNode(subProcessInstanceId, errorEvent.getData().getError().getNodeDefinitionId()),
-                errorEvent);
+        await()
+                .atMost(timeout)
+                .untilAsserted(() -> given().contentType(ContentType.JSON).body(getProcessInstanceById(event.getKogitoProcessInstanceId()))
+                        .when().post("/graphql")
+                        .then().log().ifValidationFails().statusCode(200)
+                        .body("data.ProcessInstances[0].id", is(event.getData().getProcessInstanceId()))
+                        .body("data.ProcessInstances[0].error.message", errorEvent.getData().getErrorMessage() == null ? is(nullValue()) : is(errorEvent.getData().getErrorMessage()))
+                        .body("data.ProcessInstances[0].error.nodeDefinitionId",
+                                errorEvent.getData().getNodeDefinitionId() == null ? is(nullValue()) : is(errorEvent.getData().getNodeDefinitionId())));
     }
 
     @Test
@@ -674,7 +686,9 @@ void testUserTaskInstanceDomainIndex() throws Exception {
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Deals", isA(Collection.class));
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
+        UserTaskInstanceStateDataEvent event;
+
+        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
         indexUserTaskCloudEvent(event);
 
         validateUserTaskInstance(getUserTaskInstanceById(taskId), event);
@@ -685,7 +699,6 @@ void testUserTaskInstanceDomainIndex() throws Exception {
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.Deals[0].id", is(processInstanceId))
                 .body("data.Deals[0].__typename", is("Deals"))
-                .body("data.Deals[0].metadata.lastUpdate", is(formatOffsetDateTime(event.getTime())))
                 .body("data.Deals[0].metadata.userTasks.size()", is(1))
                 .body("data.Deals[0].metadata.userTasks[0].id", is(taskId))
                 .body("data.Deals[0].metadata.userTasks[0].description", is("TaskDescription"))
@@ -693,60 +706,25 @@ void testUserTaskInstanceDomainIndex() throws Exception {
                 .body("data.Deals[0].metadata.userTasks[0].name", is("TaskName"))
                 .body("data.Deals[0].metadata.userTasks[0].priority", is("High"))
                 .body("data.Deals[0].metadata.userTasks[0].actualOwner", is("kogito"))
-                .body("data.Deals[0].metadata.userTasks[0].started", is(formatDateTime(event.getData().getStartDate())))
-                .body("data.Deals[0].metadata.userTasks[0].completed", is(formatDateTime(event.getData().getCompleteDate())))
-                .body("data.Deals[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(event.getTime())));
-
-        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
-        event.getData().update().completeDate(new Date());
-        event.getData().update().taskPriority("Low");
-        event.getData().update().actualOwner("admin");
-        event.getData().update().state("Completed");
+                .body("data.Deals[0].metadata.userTasks[0].started", is(formatDateTime(event.getData().getEventDate())))
+                .body("data.Deals[0].metadata.userTasks[0].lastUpdate", anything());
+
+        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state, "kogito", 2);
+        UserTaskInstanceStateEventBody body = UserTaskInstanceStateEventBody.create()
+                .eventType(2)
+                .userTaskInstanceId(taskId)
+                .state("Completed")
+                .userTaskName("TaskName")
+                .userTaskDescription("TaskDescription")
+                .userTaskPriority("Low")
+                .actualOwner("admin")
+                .eventDate(new Date())
+                .processInstanceId(processInstanceId)
+                .build();
+        event.setData(body);
 
         indexUserTaskCloudEvent(event);
 
-        validateUserTaskInstance(getUserTaskInstanceByIdAndActualOwner(taskId, "admin"), event);
-
-        given().contentType(ContentType.JSON)
-                .body(getDealsByTaskId(taskId))
-                .when().post("/graphql")
-                .then().log().ifValidationFails().statusCode(200)
-                .body("data.Deals[0].id", is(processInstanceId))
-                .body("data.Deals[0].__typename", is("Deals"))
-                .body("data.Deals[0].metadata.lastUpdate", is(formatOffsetDateTime(event.getTime())))
-                .body("data.Deals[0].metadata.userTasks.size()", is(1))
-                .body("data.Deals[0].metadata.userTasks[0].id", is(taskId))
-                .body("data.Deals[0].metadata.userTasks[0].description", is("TaskDescription"))
-                .body("data.Deals[0].metadata.userTasks[0].state", is("Completed"))
-                .body("data.Deals[0].metadata.userTasks[0].name", is("TaskName"))
-                .body("data.Deals[0].metadata.userTasks[0].priority", is("Low"))
-                .body("data.Deals[0].metadata.userTasks[0].actualOwner", is("admin"))
-                .body("data.Deals[0].metadata.userTasks[0].started", is(formatDateTime(event.getData().getStartDate())))
-                .body("data.Deals[0].metadata.userTasks[0].completed", is(formatDateTime(event.getData().getCompleteDate())))
-                .body("data.Deals[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(event.getTime())));
-
-        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state, null);
-        indexUserTaskCloudEvent(event);
-
-        validateUserTaskInstance(getUserTaskInstanceByIdNoActualOwner(taskId), event);
-
-        given().contentType(ContentType.JSON)
-                .body(getDealsByTaskIdNoActualOwner(taskId))
-                .when().post("/graphql")
-                .then().log().ifValidationFails().statusCode(200)
-                .body("data.Deals[0].id", is(processInstanceId))
-                .body("data.Deals[0].__typename", is("Deals"))
-                .body("data.Deals[0].metadata.lastUpdate", is(formatOffsetDateTime(event.getTime())))
-                .body("data.Deals[0].metadata.userTasks.size()", is(1))
-                .body("data.Deals[0].metadata.userTasks[0].id", is(taskId))
-                .body("data.Deals[0].metadata.userTasks[0].description", is("TaskDescription"))
-                .body("data.Deals[0].metadata.userTasks[0].state", is("InProgress"))
-                .body("data.Deals[0].metadata.userTasks[0].name", is("TaskName"))
-                .body("data.Deals[0].metadata.userTasks[0].priority", is("High"))
-                .body("data.Deals[0].metadata.userTasks[0].actualOwner", nullValue())
-                .body("data.Deals[0].metadata.userTasks[0].started", is(formatDateTime(event.getData().getStartDate())))
-                .body("data.Deals[0].metadata.userTasks[0].completed", is(formatDateTime(event.getData().getCompleteDate())))
-                .body("data.Deals[0].metadata.userTasks[0].lastUpdate", is(formatOffsetDateTime(event.getTime())));
     }
 
     private String getProtoBufferFileWithoutModelType() {
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
index b40ae732dc..9eed26044c 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
@@ -1,31 +1,36 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service;
 
 import javax.enterprise.inject.Any;
 import javax.inject.Inject;
 
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
 
 import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
 
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESS_DEFINITIONS_EVENTS;
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
 
 public abstract class AbstractIndexingIT {
@@ -34,11 +39,15 @@ public abstract class AbstractIndexingIT {
     @Any
     public InMemoryConnector connector;
 
-    protected void indexProcessCloudEvent(ProcessInstanceDataEvent event) {
+    protected void indexProcessCloudEvent(ProcessDefinitionDataEvent event) {
+        connector.source(KOGITO_PROCESS_DEFINITIONS_EVENTS).send(event);
+    }
+
+    protected void indexProcessCloudEvent(ProcessInstanceDataEvent<?> event) {
         connector.source(KOGITO_PROCESSINSTANCES_EVENTS).send(event);
     }
 
-    protected void indexUserTaskCloudEvent(UserTaskInstanceDataEvent event) {
+    protected void indexUserTaskCloudEvent(UserTaskInstanceDataEvent<?> event) {
         connector.source(KOGITO_USERTASKINSTANCES_EVENTS).send(event);
     }
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
index 29f212218b..acceac7a11 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
@@ -1,27 +1,32 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
 
 import javax.inject.Inject;
@@ -30,11 +35,15 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
-import org.kie.kogito.index.model.MilestoneStatus;
+import org.kie.kogito.index.model.ProcessInstanceState;
 import org.kie.kogito.index.storage.DataIndexStorageService;
+import org.kie.kogito.index.test.TestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,27 +53,26 @@
 import static io.restassured.RestAssured.given;
 import static io.restassured.config.EncoderConfig.encoderConfig;
 import static org.awaitility.Awaitility.await;
+import static org.hamcrest.CoreMatchers.anything;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.isA;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.emptyOrNullString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItems;
 import static org.kie.kogito.index.DateTimeUtils.formatDateTime;
-import static org.kie.kogito.index.DateTimeUtils.formatOffsetDateTime;
 import static org.kie.kogito.index.DateTimeUtils.formatZonedDateTime;
 import static org.kie.kogito.index.model.ProcessInstanceState.ACTIVE;
 import static org.kie.kogito.index.model.ProcessInstanceState.COMPLETED;
-import static org.kie.kogito.index.model.ProcessInstanceState.ERROR;
+import static org.kie.kogito.index.model.ProcessInstanceState.PENDING;
 import static org.kie.kogito.index.service.GraphQLUtils.getJobById;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessDefinitionByIdAndVersion;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByBusinessKey;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByCreatedBy;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceById;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndAddon;
-import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndErrorNode;
-import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndMilestoneName;
-import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndMilestoneStatus;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndNullParentProcessInstanceId;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndNullRootProcessInstanceId;
 import static org.kie.kogito.index.service.GraphQLUtils.getProcessInstanceByIdAndParentProcessInstanceId;
@@ -77,20 +85,19 @@
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceById;
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndActualOwner;
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndCompleted;
-import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndPotentialGroups;
-import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndPotentialUsers;
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndProcessId;
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndStarted;
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdAndState;
 import static org.kie.kogito.index.service.GraphQLUtils.getUserTaskInstanceByIdNoActualOwner;
 import static org.kie.kogito.index.test.TestUtils.getJobCloudEvent;
 import static org.kie.kogito.index.test.TestUtils.getProcessCloudEvent;
-import static org.kie.kogito.index.test.TestUtils.getProcessInstanceVariablesMap;
+import static org.kie.kogito.index.test.TestUtils.getProcessDefinitionDataEvent;
 import static org.kie.kogito.index.test.TestUtils.getUserTaskCloudEvent;
 
 public abstract class AbstractIndexingServiceIT extends AbstractIndexingIT {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractIndexingServiceIT.class);
+    public static final String CURRENT_USER = "currentUser";
 
     Duration timeout = Duration.ofSeconds(30);
 
@@ -132,67 +139,52 @@ void testDefaultGraphqlTypes() {
                 .then().log().ifValidationFails().statusCode(200).body("data.Jobs", isA(Collection.class));
     }
 
-    protected void validateProcessDefinition(String query, ProcessInstanceDataEvent event) {
+    protected void validateProcessDefinition(String query, ProcessDefinitionDataEvent event) {
         LOGGER.debug("GraphQL query: {}", query);
         await()
                 .atMost(timeout)
                 .untilAsserted(() -> given().contentType(ContentType.JSON).body(query)
                         .when().post("/graphql")
                         .then().log().ifValidationFails().statusCode(200)
-                        .body("data.ProcessDefinitions[0].id", is(event.getData().getProcessId()))
-                        .body("data.ProcessDefinitions[0].name", is(event.getData().getProcessName()))
+                        .body("data.ProcessDefinitions[0].id", is(event.getData().getId()))
+                        .body("data.ProcessDefinitions[0].name", is(event.getData().getName()))
                         .body("data.ProcessDefinitions[0].version", is(event.getData().getVersion()))
-                        .body("data.ProcessDefinitions[0].type", is(event.getData().getProcessType()))
-                        .body("data.ProcessDefinitions[0].addons", event.getKogitoAddons() == null ? is(nullValue()) : hasItems(event.getKogitoAddons().split(",")))
-                        .body("data.ProcessDefinitions[0].roles", event.getData().getRoles() == null ? is(nullValue()) : hasItems(event.getData().getRoles().toArray())));
+                        .body("data.ProcessDefinitions[0].type", is(event.getData().getType()))
+                        .body("data.ProcessDefinitions[0].description", is(event.getData().getDescription()))
+                        .body("data.ProcessDefinitions[0].annotations", containsInAnyOrder(event.getData().getAnnotations().toArray()))
+                        .body("data.ProcessDefinitions[0].metadata", equalTo(event.getData().getMetadata()))
+                        .body("data.ProcessDefinitions[0].addons", containsInAnyOrder(event.getData().getAddons().toArray()))
+                        .body("data.ProcessDefinitions[0].roles", containsInAnyOrder(event.getData().getRoles().toArray())));
     }
 
-    protected void validateProcessInstance(String query, ProcessInstanceDataEvent event, String childProcessInstanceId) {
+    protected void validateProcessInstance(String query, ProcessInstanceStateDataEvent event, String childProcessInstanceId) {
         LOGGER.debug("GraphQL query: {}", query);
         await()
                 .atMost(timeout)
                 .untilAsserted(() -> given().contentType(ContentType.JSON).body(query)
                         .when().post("/graphql")
                         .then().log().ifValidationFails().statusCode(200)
-                        .body("data.ProcessInstances[0].id", is(event.getData().getId()))
+                        .body("data.ProcessInstances[0].id", is(event.getData().getProcessInstanceId()))
                         .body("data.ProcessInstances[0].processId", is(event.getData().getProcessId()))
                         .body("data.ProcessInstances[0].processName", is(event.getData().getProcessName()))
-                        .body("data.ProcessInstances[0].version", is(event.getData().getVersion()))
+                        .body("data.ProcessInstances[0].version", is(event.getData().getProcessVersion()))
+                        .body("data.ProcessInstances[0].state", is(ProcessInstanceState.fromStatus(event.getData().getState()).name()))
                         .body("data.ProcessInstances[0].rootProcessId", is(event.getData().getRootProcessId()))
-                        .body("data.ProcessInstances[0].rootProcessInstanceId", is(event.getData().getRootInstanceId()))
+                        .body("data.ProcessInstances[0].rootProcessInstanceId", is(event.getData().getRootProcessInstanceId()))
                         .body("data.ProcessInstances[0].parentProcessInstanceId", is(event.getData().getParentInstanceId()))
                         .body("data.ProcessInstances[0].parentProcessInstance.id", event.getData().getParentInstanceId() == null ? is(nullValue()) : is(event.getData().getParentInstanceId()))
                         .body("data.ProcessInstances[0].parentProcessInstance.processName", event.getData().getParentInstanceId() == null ? is(nullValue()) : is(not(emptyOrNullString())))
-                        .body("data.ProcessInstances[0].start", is(formatDateTime(event.getData().getStartDate())))
-                        .body("data.ProcessInstances[0].end", event.getData().getEndDate() == null ? is(nullValue()) : is(formatDateTime(event.getData().getEndDate())))
+                        .body("data.ProcessInstances[0].start", anything())
                         .body("data.ProcessInstances[0].childProcessInstances[0].id", childProcessInstanceId == null ? is(nullValue()) : is(childProcessInstanceId))
                         .body("data.ProcessInstances[0].childProcessInstances[0].processName", childProcessInstanceId == null ? is(nullValue()) : is(not(emptyOrNullString())))
                         .body("data.ProcessInstances[0].endpoint", is(event.getSource().toString()))
                         .body("data.ProcessInstances[0].serviceUrl", event.getSource().toString().equals("/" + event.getData().getProcessId()) ? is(nullValue()) : is("http://localhost:8080"))
                         .body("data.ProcessInstances[0].addons", event.getKogitoAddons() == null ? is(nullValue()) : hasItems(event.getKogitoAddons().split(",")))
-                        .body("data.ProcessInstances[0].error.message", event.getData().getError() == null ? is(nullValue()) : is(event.getData().getError().getErrorMessage()))
-                        .body("data.ProcessInstances[0].error.nodeDefinitionId", event.getData().getError() == null ? is(nullValue()) : is(event.getData().getError().getNodeDefinitionId()))
-                        .body("data.ProcessInstances[0].lastUpdate", is(formatOffsetDateTime(event.getTime())))
-                        .body("data.ProcessInstances[0].nodes.size()", is(event.getData().getNodeInstances().size()))
-                        .body("data.ProcessInstances[0].nodes[0].id", is(event.getData().getNodeInstances().stream().findFirst().get().getId()))
-                        .body("data.ProcessInstances[0].nodes[0].name", is(event.getData().getNodeInstances().stream().findFirst().get().getNodeName()))
-                        .body("data.ProcessInstances[0].nodes[0].nodeId", is(event.getData().getNodeInstances().stream().findFirst().get().getNodeId()))
-                        .body("data.ProcessInstances[0].nodes[0].type", is(event.getData().getNodeInstances().stream().findFirst().get().getNodeType()))
-                        .body("data.ProcessInstances[0].nodes[0].definitionId", is(event.getData().getNodeInstances().stream().findFirst().get().getNodeDefinitionId()))
-                        .body("data.ProcessInstances[0].nodes[0].enter", is(formatDateTime(event.getData().getNodeInstances().stream().findFirst().get().getTriggerTime())))
-                        .body("data.ProcessInstances[0].nodes[0].exit",
-                                event.getData().getNodeInstances().stream().findFirst().get().getLeaveTime() == null ? is(nullValue())
-                                        : is(formatDateTime(event.getData().getNodeInstances().stream().findFirst().get().getLeaveTime())))
-                        .body("data.ProcessInstances[0].milestones.size()", is(event.getData().getMilestones().size()))
-                        .body("data.ProcessInstances[0].milestones[0].id", is(event.getData().getMilestones().stream().findFirst().get().getId()))
-                        .body("data.ProcessInstances[0].milestones[0].name", is(event.getData().getMilestones().stream().findFirst().get().getName()))
-                        .body("data.ProcessInstances[0].milestones[0].status", is(event.getData().getMilestones().stream().findFirst().get().getStatus()))
-                        .body("data.ProcessInstances[0].definition.id", is(event.getData().getProcessId()))
-                        .body("data.ProcessInstances[0].definition.version", is(event.getData().getVersion()))
-                        .body("data.ProcessInstances[0].definition.name", is(event.getData().getProcessName())));
+                        .body("data.ProcessInstances[0].lastUpdate", anything()));
+
     }
 
-    protected void validateProcessInstance(String query, ProcessInstanceDataEvent event) {
+    protected void validateProcessInstance(String query, ProcessInstanceStateDataEvent event) {
         validateProcessInstance(query, event, null);
     }
 
@@ -203,7 +195,9 @@ void testProcessInstancePagination() {
 
         IntStream.range(0, 100).forEach(i -> {
             String pId = UUID.randomUUID().toString();
-            ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, pId, ACTIVE, null, null, null, "currentUser");
+
+            ProcessInstanceDataEvent<?> startEvent = getProcessCloudEvent(processId, pId, ACTIVE, null, null, null, CURRENT_USER);
+
             indexProcessCloudEvent(startEvent);
             pIds.add(pId);
             await()
@@ -240,7 +234,7 @@ void testUserTaskInstancePagination() {
 
         IntStream.range(0, 100).forEach(i -> {
             String taskId = UUID.randomUUID().toString();
-            UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, UUID.randomUUID().toString(), null, null, "InProgress");
+            UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, UUID.randomUUID().toString(), null, null, "InProgress");
             indexUserTaskCloudEvent(event);
             taskIds.add(taskId);
             await()
@@ -289,6 +283,42 @@ void testUserTaskInstancePagination() {
                         .body("data.UserTaskInstances[99].id", is(taskIds.get(99))));
     }
 
+    @Test
+    void testConcurrentProcessInstanceIndex() throws Exception {
+        String processId = "travels";
+        ExecutorService executorService = new ScheduledThreadPoolExecutor(8);
+        int max_instance_events = 10;
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+        String processInstanceId = UUID.randomUUID().toString();
+        //indexing multiple events in parallel to the same process instance id
+        for (int i = 0; i < max_instance_events; i++) {
+            addFutureEvent(futures, processId, processInstanceId, ACTIVE, executorService, false);
+            addFutureEvent(futures, processId, processInstanceId, PENDING, executorService, false);
+            addFutureEvent(futures, processId, processInstanceId, ACTIVE, executorService, false);
+            addFutureEvent(futures, processId, processInstanceId, COMPLETED, executorService, false);
+        }
+        //delay the last event to assert later the state
+        addFutureEvent(futures, processId, processInstanceId, COMPLETED, executorService, true);
+        //wait for all futures to complete
+        CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).get(20, TimeUnit.SECONDS);
+        ProcessInstanceStateDataEvent event = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, CURRENT_USER);
+        validateProcessInstance(getProcessInstanceById(processInstanceId), event);
+    }
+
+    private void addFutureEvent(List<CompletableFuture<Void>> futures, String processId, String processInstanceId, ProcessInstanceState state, ExecutorService executorService, boolean delay) {
+        futures.add(CompletableFuture.runAsync(() -> {
+            if (delay) {
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            ProcessInstanceStateDataEvent event = getProcessCloudEvent(processId, processInstanceId, state, null, null, null, CURRENT_USER);
+            indexProcessCloudEvent(event);
+        }, executorService));
+    }
+
     @Test
     void testProcessInstanceIndex() throws Exception {
         String processId = "travels";
@@ -296,38 +326,33 @@ void testProcessInstanceIndex() throws Exception {
         String subProcessId = processId + "_sub";
         String subProcessInstanceId = UUID.randomUUID().toString();
 
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+        ProcessDefinitionDataEvent definitionDataEvent = getProcessDefinitionDataEvent(processId);
+        indexProcessCloudEvent(definitionDataEvent);
+        validateProcessDefinition(getProcessDefinitionByIdAndVersion(processId, definitionDataEvent.getData().getVersion()), definitionDataEvent);
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, CURRENT_USER);
         indexProcessCloudEvent(startEvent);
 
-        validateProcessDefinition(getProcessDefinitionByIdAndVersion(startEvent.getKogitoProcessId(), startEvent.getData().getVersion()), startEvent);
         validateProcessInstance(getProcessInstanceById(processInstanceId), startEvent);
         validateProcessInstance(getProcessInstanceByIdAndState(processInstanceId, ACTIVE), startEvent);
         validateProcessInstance(getProcessInstanceByIdAndProcessId(processInstanceId, processId), startEvent);
         validateProcessInstance(
-                getProcessInstanceByIdAndStart(processInstanceId, formatDateTime(startEvent.getData().getStartDate())),
+                getProcessInstanceByIdAndStart(processInstanceId, formatDateTime(startEvent.getData().getEventDate())),
                 startEvent);
         validateProcessInstance(getProcessInstanceByIdAndAddon(processInstanceId, "process-management"), startEvent);
-        validateProcessInstance(getProcessInstanceByIdAndMilestoneName(processInstanceId, "SimpleMilestone"), startEvent);
-        validateProcessInstance(getProcessInstanceByIdAndMilestoneStatus(processInstanceId, MilestoneStatus.AVAILABLE.name()),
-                startEvent);
         validateProcessInstance(getProcessInstanceByBusinessKey(startEvent.getData().getBusinessKey()), startEvent);
-        validateProcessInstance(getProcessInstanceByCreatedBy(startEvent.getData().getIdentity()), startEvent);
-        validateProcessInstance(getProcessInstanceByUpdatedBy(startEvent.getData().getIdentity()), startEvent);
-
-        ProcessInstanceDataEvent endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, "currentUser");
-        endEvent.getData().update().endDate(new Date());
-        Map<String, Object> variablesMap = getProcessInstanceVariablesMap();
-        ((Map<String, Object>) variablesMap.get("hotel")).put("name", "Ibis");
-        ((Map<String, Object>) variablesMap.get("flight")).put("flightNumber", "QF444");
-        endEvent.getData().update().variables(variablesMap);
-        endEvent.getData().getMilestones().stream().findFirst().get().update().status(MilestoneStatus.COMPLETED.name());
+        validateProcessInstance(getProcessInstanceByCreatedBy(startEvent.getData().getEventUser()), startEvent);
+        validateProcessInstance(getProcessInstanceByUpdatedBy(startEvent.getData().getEventUser()), startEvent);
+
+        ProcessInstanceStateDataEvent endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, CURRENT_USER);
+
         indexProcessCloudEvent(endEvent);
 
         validateProcessInstance(getProcessInstanceByIdAndState(processInstanceId, COMPLETED), endEvent);
-        validateProcessInstance(getProcessInstanceByIdAndMilestoneStatus(processInstanceId, MilestoneStatus.COMPLETED.name()), endEvent);
 
-        ProcessInstanceDataEvent event = getProcessCloudEvent(subProcessId, subProcessInstanceId, ACTIVE, processInstanceId,
-                processId, processInstanceId, "currentUser");
+        ProcessInstanceStateDataEvent event = getProcessCloudEvent(subProcessId, subProcessInstanceId, ACTIVE, processInstanceId,
+                processId, processInstanceId, CURRENT_USER);
+
         indexProcessCloudEvent(event);
 
         validateProcessInstance(getProcessInstanceByParentProcessInstanceId(processInstanceId), event);
@@ -340,13 +365,19 @@ void testProcessInstanceIndex() throws Exception {
         validateProcessInstance(getProcessInstanceByIdAndParentProcessInstanceId(subProcessInstanceId, processInstanceId),
                 event);
 
-        ProcessInstanceDataEvent errorEvent = getProcessCloudEvent(subProcessId, subProcessInstanceId, ERROR, processInstanceId,
-                processId, processInstanceId, "currentUser");
+        ProcessInstanceErrorDataEvent errorEvent = TestUtils.deriveErrorProcessCloudEvent(event, "error", "nodeDefintionId", "nodeInstanceId");
+
         indexProcessCloudEvent(errorEvent);
 
-        validateProcessInstance(
-                getProcessInstanceByIdAndErrorNode(subProcessInstanceId, errorEvent.getData().getError().getNodeDefinitionId()),
-                errorEvent);
+        await()
+                .atMost(timeout)
+                .untilAsserted(() -> given().contentType(ContentType.JSON).body(getProcessInstanceById(event.getKogitoProcessInstanceId()))
+                        .when().post("/graphql")
+                        .then().log().ifValidationFails().statusCode(200)
+                        .body("data.ProcessInstances[0].id", is(event.getData().getProcessInstanceId()))
+                        .body("data.ProcessInstances[0].error.message", errorEvent.getData().getErrorMessage() == null ? is(nullValue()) : is(errorEvent.getData().getErrorMessage()))
+                        .body("data.ProcessInstances[0].error.nodeDefinitionId",
+                                errorEvent.getData().getNodeDefinitionId() == null ? is(nullValue()) : is(errorEvent.getData().getNodeDefinitionId())));
     }
 
     @Test
@@ -356,36 +387,37 @@ void testUserTaskInstanceIndex() throws Exception {
         String processId = "deals";
         String processInstanceId = UUID.randomUUID().toString();
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
         indexUserTaskCloudEvent(event);
 
         validateUserTaskInstance(getUserTaskInstanceById(taskId), event);
         validateUserTaskInstance(getUserTaskInstanceByIdAndActualOwner(taskId, "kogito"), event);
         validateUserTaskInstance(getUserTaskInstanceByIdAndProcessId(taskId, processId), event);
-        validateUserTaskInstance(
-                getUserTaskInstanceByIdAndPotentialGroups(taskId, new ArrayList<>(event.getData().getPotentialGroups())),
-                event);
-        validateUserTaskInstance(
-                getUserTaskInstanceByIdAndPotentialUsers(taskId, new ArrayList<>(event.getData().getPotentialUsers())), event);
+
         validateUserTaskInstance(getUserTaskInstanceByIdAndState(taskId, event.getData().getState()), event);
-        validateUserTaskInstance(getUserTaskInstanceByIdAndStarted(taskId, formatDateTime(event.getData().getStartDate())),
+        validateUserTaskInstance(getUserTaskInstanceByIdAndStarted(taskId, formatDateTime(event.getData().getEventDate())),
                 event);
-        validateUserTaskInstance(
-                getUserTaskInstanceByIdAndCompleted(taskId, formatDateTime(event.getData().getCompleteDate())), event);
 
-        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
-        event.getData().update().completeDate(new Date());
-        event.getData().update().taskPriority("Low");
-        event.getData().update().actualOwner("admin");
-        event.getData().update().state("Completed");
+        state = "Completed";
+        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state, "kogito", 2);
+        indexUserTaskCloudEvent(event);
+
+        validateUserTaskInstance(
+                getUserTaskInstanceByIdAndCompleted(taskId, formatDateTime(event.getData().getEventDate())), event);
 
+        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state, "admin", 2);
         indexUserTaskCloudEvent(event);
 
         validateUserTaskInstance(getUserTaskInstanceByIdAndActualOwner(taskId, "admin"), event);
 
-        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state, null);
+        event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state, null, 2);
+        LOGGER.info("event {}", event);
         indexUserTaskCloudEvent(event);
 
+        LOGGER.info("value {}", given().contentType(ContentType.JSON).body(getUserTaskInstanceById(taskId))
+                .when().post("/graphql")
+                .then().statusCode(200).extract().asString());
+
         validateUserTaskInstance(getUserTaskInstanceByIdNoActualOwner(taskId), event);
     }
 
@@ -428,29 +460,24 @@ protected void validateJob(String query, KogitoJobCloudEvent event) {
                         .body("data.Jobs[0].endpoint", is(event.getData().getEndpoint())));
     }
 
-    protected void validateUserTaskInstance(String query, UserTaskInstanceDataEvent event) {
+    protected void validateUserTaskInstance(String query, UserTaskInstanceStateDataEvent event) {
         LOGGER.debug("GraphQL query: {}", query);
         await()
                 .atMost(timeout)
                 .untilAsserted(() -> given().contentType(ContentType.JSON).body(query)
                         .when().post("/graphql")
                         .then().log().ifValidationFails().statusCode(200)
-                        .body("data.UserTaskInstances[0].id", is(event.getData().getId()))
-                        .body("data.UserTaskInstances[0].processId", is(event.getData().getProcessId()))
-                        .body("data.UserTaskInstances[0].rootProcessId", is(event.getData().getRootProcessId()))
-                        .body("data.UserTaskInstances[0].rootProcessInstanceId", is(event.getData().getRootProcessInstanceId()))
-                        .body("data.UserTaskInstances[0].description", is(event.getData().getTaskDescription()))
-                        .body("data.UserTaskInstances[0].name", is(event.getData().getTaskName()))
-                        .body("data.UserTaskInstances[0].priority", is(event.getData().getTaskPriority()))
-                        .body("data.UserTaskInstances[0].actualOwner", is(event.getData().getActualOwner()))
-                        .body("data.UserTaskInstances[0].excludedUsers", hasItems(event.getData().getExcludedUsers().toArray()))
-                        .body("data.UserTaskInstances[0].potentialUsers", hasItems(event.getData().getPotentialUsers().toArray()))
-                        .body("data.UserTaskInstances[0].potentialGroups", hasItems(event.getData().getPotentialGroups().toArray()))
-                        .body("data.UserTaskInstances[0].started", is(formatDateTime(event.getData().getStartDate())))
-                        .body("data.UserTaskInstances[0].completed", is(formatDateTime(event.getData().getCompleteDate())))
-                        .body("data.UserTaskInstances[0].lastUpdate", is(formatOffsetDateTime(event.getTime())))
+                        .body("data.UserTaskInstances[0].id", is(event.getData().getUserTaskInstanceId()))
+                        .body("data.UserTaskInstances[0].processInstanceId", is(event.getData().getProcessInstanceId()))
+                        .body("data.UserTaskInstances[0].description", is(event.getData().getUserTaskDescription()))
+                        .body("data.UserTaskInstances[0].name", is(event.getData().getUserTaskName()))
+                        .body("data.UserTaskInstances[0].priority", is(event.getData().getUserTaskPriority()))
+                        .body("data.UserTaskInstances[0].actualOwner", event.getData().getActualOwner() != null ? is(event.getData().getActualOwner()) : anything())
+                        .body("data.UserTaskInstances[0].started", anything())
+                        .body("data.UserTaskInstances[0].lastUpdate", anything())
                         .body("data.UserTaskInstances[0].endpoint",
-                                is(event.getSource().toString() + "/" + event.getData().getProcessInstanceId() + "/" + event.getData().getTaskName() + "/" + event.getData().getId())));
+                                is(event.getSource().toString() + "/" + event.getData().getProcessInstanceId() + "/" + event.getData().getUserTaskName() + "/"
+                                        + event.getData().getUserTaskInstanceId())));
     }
 
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java
index 4ebc700660..f2fcd37cd0 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java
index eb7eb4c0dd..5109b4e112 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/GraphQLUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java
index 8510d63950..62fbd15702 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.api;
 
@@ -26,6 +29,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
 import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.model.UserTaskInstance;
@@ -105,9 +109,11 @@ public class KogitoRuntimeClientTest {
 
     @BeforeEach
     public void setup() {
-        client = spy(new KogitoRuntimeClientImpl(vertx, identityMock));
-        client.gatewayTargetUrl = Optional.empty();
-        client.serviceWebClientMap.put(SERVICE_URL, webClientMock);
+        client = spy(new KogitoRuntimeClientImpl());
+        client.setGatewayTargetUrl(Optional.empty());
+        client.addServiceWebClient(SERVICE_URL, webClientMock);
+        client.setVertx(vertx);
+        client.setIdentity(identityMock);
     }
 
     @Test
@@ -232,15 +238,14 @@ public void testCancelNodeInstance() {
     }
 
     @Test
-    public void testCancelJob() {
+    protected void testCancelJobRest() {
         setupIdentityMock();
         when(webClientMock.delete(anyString())).thenReturn(httpRequestMock);
-
         Job job = createJob(JOB_ID, PROCESS_INSTANCE_ID, "SCHEDULED");
         client.cancelJob(SERVICE_URL, job);
 
         verify(client).sendDeleteClientRequest(webClientMock,
-                format(CANCEL_JOB_PATH, job.getId()),
+                format(KogitoRuntimeCommonClient.CANCEL_JOB_PATH, job.getId()),
                 "CANCEL Job with id: " + JOB_ID);
         ArgumentCaptor<Handler> handlerCaptor = ArgumentCaptor.forClass(Handler.class);
         verify(httpRequestMock).send(handlerCaptor.capture());
@@ -248,21 +253,28 @@ public void testCancelJob() {
     }
 
     @Test
-    public void testRescheduleJob() {
-        String newJobData = "{ }";
+    protected void testRescheduleWithoutJobServiceInstance() {
+        String newJobData = "{\"expirationTime\": \"2023-08-27T04:35:54.631Z\",\"retries\": 2}";
         setupIdentityMock();
-        when(webClientMock.put(anyString())).thenReturn(httpRequestMock);
-        when(httpRequestMock.putHeader(eq("Content-Type"), anyString())).thenReturn(httpRequestMock);
+        when(webClientMock.patch(anyString())).thenReturn(httpRequestMock);
 
         Job job = createJob(JOB_ID, PROCESS_INSTANCE_ID, "SCHEDULED");
 
         client.rescheduleJob(SERVICE_URL, job, newJobData);
-        verify(client).sendJSONPutClientRequest(webClientMock,
-                format(RESCHEDULE_JOB_PATH, JOB_ID),
-                "RESCHEDULED JOB with id: " + job.getId(), newJobData);
+        ArgumentCaptor<JsonObject> jsonCaptor = ArgumentCaptor.forClass(JsonObject.class);
+
+        verify(client).sendPatchClientRequest(eq(webClientMock),
+                eq(format(KogitoRuntimeCommonClient.RESCHEDULE_JOB_PATH, JOB_ID)),
+                eq("RESCHEDULED JOB with id: " + job.getId()),
+                jsonCaptor.capture());
+
+        assertThat(jsonCaptor.getValue().getString("expirationTime")).isEqualTo("2023-08-27T04:35:54.631Z");
+        assertThat(jsonCaptor.getValue().getString("retries")).isEqualTo("2");
+
         ArgumentCaptor<Handler> handlerCaptor = ArgumentCaptor.forClass(Handler.class);
         JsonObject jsonOject = new JsonObject(newJobData);
         verify(httpRequestMock).sendJson(eq(jsonOject), handlerCaptor.capture());
+        verify(httpRequestMock).putHeader("Authorization", "Bearer " + AUTHORIZED_TOKEN);
         checkResponseHandling(handlerCaptor.getValue());
     }
 
@@ -576,7 +588,7 @@ public void testMalformedURL() {
     @Test
     void testOverrideURL() {
         String host = "host.testcontainers.internal";
-        client.gatewayTargetUrl = Optional.of(host);
+        client.setGatewayTargetUrl(Optional.of(host));
         WebClientOptions webClientOptions = client.getWebClientToURLOptions("http://service.com");
         assertThat(webClientOptions.getDefaultHost()).isEqualTo(host);
     }
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/auth/MultiTenantResolverTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/auth/MultiTenantResolverTest.java
index 8d1d9b2dda..6b541c241b 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/auth/MultiTenantResolverTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/auth/MultiTenantResolverTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.auth;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
index 563ed1b6fd..8fc93d4bf2 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.cache;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
index 482a87f692..f38c8a9b3e 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.cache;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
index 3b46cc2381..a577e98587 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.graphql;
 
@@ -27,7 +30,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
 import org.kie.kogito.index.model.ProcessInstanceState;
 import org.kie.kogito.index.service.AbstractIndexingIT;
@@ -149,7 +152,8 @@ private void assertDomainSubscription(String processId, String processInstanceId
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Travels", isA(Collection.class));
 
-        ProcessInstanceDataEvent event = getProcessCloudEvent(processId, processInstanceId, state, null, null, null, "currentUser");
+        ProcessInstanceDataEvent<?> event = getProcessCloudEvent(processId, processInstanceId, state, null, null, null, "currentUser");
+
         indexProcessCloudEvent(event);
 
         JsonObject json = cf.get(1, TimeUnit.MINUTES);
@@ -157,8 +161,7 @@ private void assertDomainSubscription(String processId, String processInstanceId
         assertThatJson(json.toString()).and(
                 a -> a.node("type").isEqualTo("data"),
                 a -> a.node("payload.data." + subscriptionName + ".id").isEqualTo(processInstanceId),
-                a -> a.node("payload.data." + subscriptionName + ".metadata.processInstances[0].state").isEqualTo(state.name()),
-                a -> a.node("payload.data." + subscriptionName + ".traveller.firstName").isEqualTo("Maciej"));
+                a -> a.node("payload.data." + subscriptionName + ".metadata.processInstances[0].state").isEqualTo(state.name()));
     }
 
     private void assertProcessInstanceSubscription(String processId, String processInstanceId, ProcessInstanceState state, String subscription, String subscriptionName) throws Exception {
@@ -168,7 +171,8 @@ private void assertProcessInstanceSubscription(String processId, String processI
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Travels", isA(Collection.class));
 
-        ProcessInstanceDataEvent event = getProcessCloudEvent(processId, processInstanceId, state, null, null, null, "currentUser");
+        ProcessInstanceDataEvent<?> event = getProcessCloudEvent(processId, processInstanceId, state, null, null, null, "currentUser");
+
         indexProcessCloudEvent(event);
 
         JsonObject json = cf.get(1, TimeUnit.MINUTES);
@@ -187,7 +191,7 @@ private void assertUserTaskInstanceSubscription(String taskId, String processId,
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200).body("data.Deals", isA(Collection.class));
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
+        UserTaskInstanceDataEvent<?> event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, state);
         indexUserTaskCloudEvent(event);
 
         JsonObject json = cf.get(1, TimeUnit.MINUTES);
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerTest.java
index b8c5f792e6..8801502eb1 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
index 710dccaad2..0dfd09e618 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.graphql.query;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
index 5121ae0a48..f9dc10f1e6 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
@@ -1,20 +1,24 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.graphql.query;
 
+import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -25,9 +29,12 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceEventBody;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
 import org.kie.kogito.index.api.KogitoRuntimeClient;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
 import org.kie.kogito.index.model.UserTaskInstance;
@@ -46,9 +53,9 @@
 import static org.kie.kogito.index.test.TestUtils.getJobCloudEvent;
 import static org.kie.kogito.index.test.TestUtils.getProcessCloudEvent;
 import static org.kie.kogito.index.test.TestUtils.getProcessInstance;
-import static org.kie.kogito.index.test.TestUtils.getTaskAttachment;
-import static org.kie.kogito.index.test.TestUtils.getTaskComment;
+import static org.kie.kogito.index.test.TestUtils.getUserTaskAttachmentEvent;
 import static org.kie.kogito.index.test.TestUtils.getUserTaskCloudEvent;
+import static org.kie.kogito.index.test.TestUtils.getUserTaskCommentEvent;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -78,7 +85,9 @@ public void setup() throws Exception {
     @Test
     void testProcessInstanceAbort() {
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"mutation{ ProcessInstanceAbort ( id: \\\"" + processInstanceId + "\\\")}\"}");
@@ -90,7 +99,9 @@ void testProcessInstanceAbort() {
     @Test
     void testProcessInstanceRetry() {
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"mutation{ ProcessInstanceRetry ( id: \\\"" + processInstanceId + "\\\")}\"}");
@@ -102,7 +113,9 @@ void testProcessInstanceRetry() {
     @Test
     void testProcessInstanceSkip() {
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"mutation{ ProcessInstanceSkip ( id: \\\"" + processInstanceId + "\\\")}\"}");
@@ -116,7 +129,8 @@ void testProcessInstanceUpdateVariables() {
         String variablesUpdated = "variablesUpdated";
         String processInstanceId = UUID.randomUUID().toString();
 
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"mutation{ ProcessInstanceUpdateVariables ( id: \\\"" + processInstanceId + "\\\", variables: \\\"" + variablesUpdated + "\\\")}\"}");
@@ -128,7 +142,9 @@ void testProcessInstanceUpdateVariables() {
     @Test
     void testProcessDefinitionNodes() {
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"query { ProcessInstances (where: { id: {equal: \\\"" + processInstanceId + "\\\"}}) { nodeDefinitions { id }} }\" }");
@@ -138,7 +154,9 @@ void testProcessDefinitionNodes() {
     @Test
     void testProcessInstanceDiagram() {
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"query { ProcessInstances (where: { id: {equal: \\\"" + processInstanceId + "\\\"}}) {diagram} }\" }");
@@ -150,7 +168,9 @@ void testProcessInstanceDiagram() {
     @Test
     void testProcessDefinitionSource() {
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"query { ProcessInstances (where: { id: {equal: \\\"" + processInstanceId + "\\\"}}) {source} }\" }");
@@ -162,7 +182,9 @@ void testProcessDefinitionSource() {
     void testNodeInstanceTrigger() {
         String nodeId = "nodeIdToTrigger";
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"mutation{ NodeInstanceTrigger ( id: \\\"" + processInstanceId + "\\\", nodeId: \\\"" + nodeId + "\\\")}\"}");
@@ -175,7 +197,9 @@ void testNodeInstanceTrigger() {
     void testNodeInstanceRetrigger() {
         String nodeInstanceId = "nodeInstanceIdToRetrigger";
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"mutation{ NodeInstanceRetrigger ( id: \\\"" + processInstanceId + "\\\", nodeInstanceId: \\\"" + nodeInstanceId + "\\\")}\"}");
@@ -188,7 +212,9 @@ void testNodeInstanceRetrigger() {
     void testNodeInstanceCancel() {
         String nodeInstanceId = "nodeInstanceIdToCancel";
         String processInstanceId = UUID.randomUUID().toString();
-        ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
+        ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+
         indexProcessCloudEvent(startEvent);
 
         checkOkResponse("{ \"query\" : \"mutation{ NodeInstanceCancel ( id: \\\"" + processInstanceId + "\\\", nodeInstanceId: \\\"" + nodeInstanceId + "\\\")}\"}");
@@ -232,8 +258,8 @@ void testGetTaskSchema() {
         String processInstanceId = UUID.randomUUID().toString();
         String taskId = UUID.randomUUID().toString();
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
 
         indexUserTaskCloudEvent(event);
         checkOkResponse("{ \"query\" : \"{UserTaskInstances (where: {id: {equal:\\\"" + taskId + "\\\" }}){ " +
@@ -253,8 +279,8 @@ void testUpdateUserTaskInstance() {
         String taskId = UUID.randomUUID().toString();
         String newDescription = "NewDescription";
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
 
         indexUserTaskCloudEvent(event);
         checkOkResponse("{ \"query\" : \"mutation { UserTaskInstanceUpdate ( " +
@@ -279,10 +305,16 @@ void testCreateTaskComment() {
         String taskId = UUID.randomUUID().toString();
         String comment = "Comment to add";
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
 
         indexUserTaskCloudEvent(event);
+
+        UserTaskInstanceCommentDataEvent commmentEvent = getUserTaskCommentEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, UUID.randomUUID().toString(), comment, UserTaskInstanceCommentEventBody.EVENT_TYPE_ADDED);
+
+        indexUserTaskCloudEvent(commmentEvent);
+
         checkOkResponse("{ \"query\" : \"mutation{ UserTaskInstanceCommentCreate(" +
                 "taskId: \\\"" + taskId + "\\\", " +
                 "user: \\\"" + user + "\\\", " +
@@ -305,11 +337,16 @@ void testUpdateUserTaskInstanceComment() {
         String commentId = UUID.randomUUID().toString();
         String commentContent = "commentContent";
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
-        UserTaskInstanceEventBody userTaskInstance = event.getData();
-        userTaskInstance.setComments(List.of(getTaskComment(commentId, null, null)));
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
+
         indexUserTaskCloudEvent(event);
+
+        UserTaskInstanceCommentDataEvent commmentEvent = getUserTaskCommentEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, commentId, commentContent, UserTaskInstanceCommentEventBody.EVENT_TYPE_ADDED);
+
+        indexUserTaskCloudEvent(commmentEvent);
+
         checkOkResponse("{ \"query\" : \"mutation { UserTaskInstanceCommentUpdate ( " +
                 "user: \\\"" + user + "\\\", " +
                 "groups: [\\\"managers\\\", \\\"users\\\", \\\"IT\\\"]," +
@@ -330,10 +367,16 @@ void testDeleteUserTaskInstanceComment() {
         String taskId = UUID.randomUUID().toString();
         String commentId = UUID.randomUUID().toString();
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
-        UserTaskInstanceEventBody userTaskInstance = event.getData();
-        userTaskInstance.setComments(List.of(getTaskComment(commentId, null, null)));
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
+
+        indexUserTaskCloudEvent(event);
+
+        UserTaskInstanceCommentDataEvent commmentEvent = getUserTaskCommentEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, commentId, "my content", UserTaskInstanceCommentEventBody.EVENT_TYPE_ADDED);
+
+        indexUserTaskCloudEvent(commmentEvent);
+
         indexUserTaskCloudEvent(event);
         checkOkResponse("{ \"query\" : \"mutation { UserTaskInstanceCommentDelete ( " +
                 "user: \\\"" + user + "\\\", " +
@@ -352,13 +395,20 @@ void testDeleteUserTaskInstanceComment() {
     void testCreateTaskAttachment() {
         String processInstanceId = UUID.randomUUID().toString();
         String taskId = UUID.randomUUID().toString();
+        String attachmentId = UUID.randomUUID().toString();
         String attachmentName = "attachment name";
-        String attachmentUri = "https://drive.google.com/file/d/1Z_Lipg2jzY9TNewTaskAttachmentUri";
+        URI attachmentUri = URI.create("https://drive.google.com/file/d/1Z_Lipg2jzY9TNewTaskAttachmentUri");
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
 
         indexUserTaskCloudEvent(event);
+
+        UserTaskInstanceAttachmentDataEvent attachmentEvent = getUserTaskAttachmentEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, attachmentId, attachmentUri, attachmentName, UserTaskInstanceAttachmentEventBody.EVENT_TYPE_ADDED);
+
+        indexUserTaskCloudEvent(attachmentEvent);
+
         checkOkResponse("{ \"query\" : \"mutation{ UserTaskInstanceAttachmentCreate(" +
                 "taskId: \\\"" + taskId + "\\\", " +
                 "user: \\\"" + user + "\\\", " +
@@ -372,7 +422,7 @@ void testCreateTaskAttachment() {
                 userTaskInstanceCaptor.capture(),
                 eq(user), eq(groups),
                 eq(attachmentName),
-                eq(attachmentUri));
+                eq(attachmentUri.toString()));
         assertUserTaskInstance(userTaskInstanceCaptor.getValue(), taskId, processId, processInstanceId, user);
     }
 
@@ -382,13 +432,18 @@ void testUpdateUserTaskInstanceAttachment() {
         String taskId = UUID.randomUUID().toString();
         String attachmentId = UUID.randomUUID().toString();
         String attachmentName = "attachmentName";
-        String attachmentUri = "attachmentUri";
+        URI attachmentUri = URI.create("http://localhost:8080");
+
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
-        UserTaskInstanceEventBody userTaskInstance = event.getData();
-        userTaskInstance.setAttachments(List.of(getTaskAttachment(attachmentId, null, null, null)));
         indexUserTaskCloudEvent(event);
+
+        UserTaskInstanceAttachmentDataEvent attachmentEvent = getUserTaskAttachmentEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, attachmentId, attachmentUri, attachmentName, UserTaskInstanceAttachmentEventBody.EVENT_TYPE_ADDED);
+
+        indexUserTaskCloudEvent(attachmentEvent);
+
         checkOkResponse("{ \"query\" : \"mutation { UserTaskInstanceAttachmentUpdate ( " +
                 "user: \\\"" + user + "\\\", " +
                 "groups: [\\\"managers\\\", \\\"users\\\", \\\"IT\\\"]," +
@@ -400,7 +455,7 @@ void testUpdateUserTaskInstanceAttachment() {
 
         verify(dataIndexApiClient).updateUserTaskInstanceAttachment(eq("http://localhost:8080"),
                 userTaskInstanceCaptor.capture(),
-                eq(user), eq(groups), eq(attachmentId), eq(attachmentName), eq(attachmentUri));
+                eq(user), eq(groups), eq(attachmentId), eq(attachmentName), eq(attachmentUri.toString()));
         assertUserTaskInstance(userTaskInstanceCaptor.getValue(), taskId, processId, processInstanceId, user);
     }
 
@@ -409,12 +464,19 @@ void testDeleteUserTaskInstanceAttachment() {
         String processInstanceId = UUID.randomUUID().toString();
         String taskId = UUID.randomUUID().toString();
         String attachmentId = UUID.randomUUID().toString();
+        String attachmentName = "attachmentName";
+        URI attachmentUri = URI.create("http://localhost:8080");
+
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, 1);
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null,
-                null, "InProgress", user);
-        UserTaskInstanceEventBody userTaskInstance = event.getData();
-        userTaskInstance.setAttachments(List.of(getTaskAttachment(attachmentId, null, null, null)));
         indexUserTaskCloudEvent(event);
+
+        UserTaskInstanceAttachmentDataEvent attachmentEvent = getUserTaskAttachmentEvent(taskId, processId, processInstanceId, null,
+                null, "InProgress", user, attachmentId, attachmentUri, attachmentName, UserTaskInstanceAttachmentEventBody.EVENT_TYPE_ADDED);
+
+        indexUserTaskCloudEvent(attachmentEvent);
+
         checkOkResponse("{ \"query\" : \"mutation { UserTaskInstanceAttachmentDelete ( " +
                 "user: \\\"" + user + "\\\", " +
                 "groups: [\\\"managers\\\", \\\"users\\\", \\\"IT\\\"]," +
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java
index 9afc3a976c..ebcca023fd 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/GraphQLQueryMapperTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.graphql.query;
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapperTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapperTest.java
index 0899cf7680..bbf559eaa2 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapperTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/ProcessInstanceMetaMapperTest.java
@@ -1,24 +1,27 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.json;
 
 import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
 import org.kie.kogito.index.model.ProcessInstanceState;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -38,15 +41,15 @@ public void testProcessInstanceMapper() {
         String processInstanceId = UUID.randomUUID().toString();
         String rootProcessInstanceId = UUID.randomUUID().toString();
         String piPrefix = KOGITO_DOMAIN_ATTRIBUTE + "." + PROCESS_INSTANCES_DOMAIN_ATTRIBUTE;
-        ProcessInstanceDataEvent event = getProcessCloudEvent(processId, processInstanceId, ProcessInstanceState.COMPLETED, rootProcessInstanceId, rootProcessId, rootProcessInstanceId, "currentUser");
+
+        ProcessInstanceStateDataEvent event =
+                getProcessCloudEvent(processId, processInstanceId, ProcessInstanceState.ACTIVE, rootProcessInstanceId, rootProcessId, rootProcessInstanceId, "currentUser");
+
         ObjectNode json = new ProcessInstanceMetaMapper().apply(event);
         assertThat(json).isNotNull();
         assertThatJson(json.toString()).and(
                 a -> a.node("id").isEqualTo(rootProcessInstanceId),
                 a -> a.node("processId").isEqualTo(rootProcessId),
-                a -> a.node("traveller.firstName").isEqualTo("Maciej"),
-                a -> a.node("hotel.name").isEqualTo("Meriton"),
-                a -> a.node("flight.flightNumber").isEqualTo("MX555"),
                 a -> a.node(KOGITO_DOMAIN_ATTRIBUTE).isNotNull(),
                 a -> a.node(KOGITO_DOMAIN_ATTRIBUTE + ".lastUpdate").isEqualTo(event.getTime().toInstant().toEpochMilli()),
                 a -> a.node(piPrefix).isArray().hasSize(1),
@@ -55,11 +58,11 @@ public void testProcessInstanceMapper() {
                 a -> a.node(piPrefix + "[0].rootProcessInstanceId").isEqualTo(rootProcessInstanceId),
                 a -> a.node(piPrefix + "[0].parentProcessInstanceId").isEqualTo(rootProcessInstanceId),
                 a -> a.node(piPrefix + "[0].rootProcessId").isEqualTo(rootProcessId),
-                a -> a.node(piPrefix + "[0].state").isEqualTo(ProcessInstanceState.COMPLETED.ordinal()),
+                a -> a.node(piPrefix + "[0].state").isEqualTo(ProcessInstanceState.ACTIVE.ordinal()),
                 a -> a.node(piPrefix + "[0].endpoint").isEqualTo(event.getSource().toString()),
-                a -> a.node(piPrefix + "[0].start").isEqualTo(event.getData().getStartDate().toInstant().toEpochMilli()),
-                a -> a.node(piPrefix + "[0].end").isEqualTo(event.getData().getEndDate().toInstant().toEpochMilli()),
-                a -> a.node(piPrefix + "[0].updatedBy").isEqualTo(event.getData().getIdentity().toString()),
+                a -> a.node(piPrefix + "[0].updatedBy").isEqualTo(event.getData().getEventUser().toString()),
+                a -> a.node(piPrefix + "[0].start").isEqualTo(event.getData().getEventDate().toInstant().toEpochMilli()),
+                a -> a.node(piPrefix + "[0].end").isAbsent(),
                 a -> a.node(piPrefix + "[0].lastUpdate").isEqualTo(event.getTime().toInstant().toEpochMilli()));
     }
 
@@ -70,16 +73,16 @@ public void testProcessInstanceMapperWithBusinessKey() {
         String processInstanceId = UUID.randomUUID().toString();
         String rootProcessInstanceId = UUID.randomUUID().toString();
         String piPrefix = KOGITO_DOMAIN_ATTRIBUTE + "." + PROCESS_INSTANCES_DOMAIN_ATTRIBUTE;
-        ProcessInstanceDataEvent event = getProcessCloudEvent(processId, processInstanceId, ProcessInstanceState.COMPLETED, rootProcessInstanceId, rootProcessId, rootProcessInstanceId, "currentUser");
+
+        ProcessInstanceStateDataEvent event =
+                getProcessCloudEvent(processId, processInstanceId, ProcessInstanceState.ACTIVE, rootProcessInstanceId, rootProcessId, rootProcessInstanceId, "currentUser");
+
         event.getData().update().businessKey("custom-key");
         ObjectNode json = new ProcessInstanceMetaMapper().apply(event);
         assertThat(json).isNotNull();
         assertThatJson(json.toString()).and(
                 a -> a.node("id").isEqualTo(rootProcessInstanceId),
                 a -> a.node("processId").isEqualTo(rootProcessId),
-                a -> a.node("traveller.firstName").isEqualTo("Maciej"),
-                a -> a.node("hotel.name").isEqualTo("Meriton"),
-                a -> a.node("flight.flightNumber").isEqualTo("MX555"),
                 a -> a.node(KOGITO_DOMAIN_ATTRIBUTE).isNotNull(),
                 a -> a.node(KOGITO_DOMAIN_ATTRIBUTE + ".lastUpdate").isEqualTo(event.getTime().toInstant().toEpochMilli()),
                 a -> a.node(piPrefix).isArray().hasSize(1),
@@ -88,12 +91,12 @@ public void testProcessInstanceMapperWithBusinessKey() {
                 a -> a.node(piPrefix + "[0].rootProcessInstanceId").isEqualTo(rootProcessInstanceId),
                 a -> a.node(piPrefix + "[0].parentProcessInstanceId").isEqualTo(rootProcessInstanceId),
                 a -> a.node(piPrefix + "[0].rootProcessId").isEqualTo(rootProcessId),
-                a -> a.node(piPrefix + "[0].state").isEqualTo(ProcessInstanceState.COMPLETED.ordinal()),
+                a -> a.node(piPrefix + "[0].state").isEqualTo(ProcessInstanceState.ACTIVE.ordinal()),
                 a -> a.node(piPrefix + "[0].endpoint").isEqualTo(event.getSource().toString()),
-                a -> a.node(piPrefix + "[0].start").isEqualTo(event.getData().getStartDate().toInstant().toEpochMilli()),
-                a -> a.node(piPrefix + "[0].end").isEqualTo(event.getData().getEndDate().toInstant().toEpochMilli()),
+                a -> a.node(piPrefix + "[0].start").isEqualTo(event.getData().getEventDate().toInstant().toEpochMilli()),
+                a -> a.node(piPrefix + "[0].end").isAbsent(),
                 a -> a.node(piPrefix + "[0].lastUpdate").isEqualTo(event.getTime().toInstant().toEpochMilli()),
                 a -> a.node(piPrefix + "[0].businessKey").isEqualTo(event.getData().getBusinessKey()),
-                a -> a.node(piPrefix + "[0].updatedBy").isEqualTo(event.getData().getIdentity().toString()));
+                a -> a.node(piPrefix + "[0].updatedBy").isEqualTo(event.getData().getEventUser().toString()));
     }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapperTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapperTest.java
index 6ccc6ecd0d..2af8e5269a 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapperTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/json/UserTaskInstanceMetaMapperTest.java
@@ -1,24 +1,27 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.json;
 
 import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -38,7 +41,7 @@ public void testUserTaskInstanceMapper() {
         String processInstanceId = UUID.randomUUID().toString();
         String rootProcessInstanceId = UUID.randomUUID().toString();
         String utPrefix = KOGITO_DOMAIN_ATTRIBUTE + "." + USER_TASK_INSTANCES_DOMAIN_ATTRIBUTE;
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, rootProcessInstanceId, rootProcessId, "InProgress");
+        UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, rootProcessInstanceId, rootProcessId, "InProgress");
         ObjectNode json = new UserTaskInstanceMetaMapper().apply(event);
         assertThat(json).isNotNull();
         assertThatJson(json.toString()).and(
@@ -50,17 +53,12 @@ public void testUserTaskInstanceMapper() {
                 a -> a.node(utPrefix + "[0].id").isEqualTo(taskId),
                 a -> a.node(utPrefix + "[0].processInstanceId").isEqualTo(processInstanceId),
                 a -> a.node(utPrefix + "[0].state").isEqualTo(event.getData().getState()),
-                a -> a.node(utPrefix + "[0].description").isEqualTo(event.getData().getTaskDescription()),
-                a -> a.node(utPrefix + "[0].name").isEqualTo(event.getData().getTaskName()),
-                a -> a.node(utPrefix + "[0].priority").isEqualTo(event.getData().getTaskPriority()),
+                a -> a.node(utPrefix + "[0].description").isEqualTo(event.getData().getUserTaskDescription()),
+                a -> a.node(utPrefix + "[0].name").isEqualTo(event.getData().getUserTaskName()),
+                a -> a.node(utPrefix + "[0].priority").isEqualTo(event.getData().getUserTaskPriority()),
                 a -> a.node(utPrefix + "[0].actualOwner").isEqualTo(event.getData().getActualOwner()),
-                a -> a.node(utPrefix + "[0].adminUsers[0]").isEqualTo(event.getData().getAdminUsers().stream().findFirst().get()),
-                a -> a.node(utPrefix + "[0].adminGroups[0]").isEqualTo(event.getData().getAdminGroups().stream().findFirst().get()),
-                a -> a.node(utPrefix + "[0].excludedUsers[0]").isEqualTo(event.getData().getExcludedUsers().stream().findFirst().get()),
-                a -> a.node(utPrefix + "[0].potentialGroups[0]").isEqualTo(event.getData().getPotentialGroups().stream().findFirst().get()),
-                a -> a.node(utPrefix + "[0].potentialUsers[0]").isEqualTo(event.getData().getPotentialUsers().stream().findFirst().get()),
-                a -> a.node(utPrefix + "[0].started").isEqualTo(event.getData().getStartDate().toInstant().toEpochMilli()),
-                a -> a.node(utPrefix + "[0].completed").isEqualTo(event.getData().getCompleteDate().toInstant().toEpochMilli()),
+                a -> a.node(utPrefix + "[0].started").isEqualTo(event.getData().getEventDate().toInstant().toEpochMilli()),
+                a -> a.node(utPrefix + "[0].completed").isAbsent(),
                 a -> a.node(utPrefix + "[0].lastUpdate").isEqualTo(event.getTime().toInstant().toEpochMilli()));
     }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
index 62d5e7816c..06bbe2dbb2 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import java.time.Duration;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
index 6c5f27e9cf..3dde99da47 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
@@ -1,26 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import javax.enterprise.inject.Any;
 import javax.inject.Inject;
 
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.model.ProcessInstanceState;
 
 import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
@@ -37,13 +39,13 @@ public abstract class AbstractDomainMessagingHttpConsumerIT extends AbstractDoma
     public InMemoryConnector connector;
 
     protected void sendUserTaskInstanceEvent() throws Exception {
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent("45fae435-b098-4f27-97cf-a0c107072e8b", "travels",
+        UserTaskInstanceDataEvent<?> event = getUserTaskCloudEvent("45fae435-b098-4f27-97cf-a0c107072e8b", "travels",
                 "2308e23d-9998-47e9-a772-a078cf5b891b", null, null, "Completed");
         connector.source(KOGITO_USERTASKINSTANCES_EVENTS).send(event);
     }
 
     protected void sendProcessInstanceEvent() throws Exception {
-        ProcessInstanceDataEvent event = getProcessCloudEvent("travels", "2308e23d-9998-47e9-a772-a078cf5b891b",
+        ProcessInstanceDataEvent<?> event = getProcessCloudEvent("travels", "2308e23d-9998-47e9-a772-a078cf5b891b",
                 ProcessInstanceState.ACTIVE, null,
                 null, null, "currentUser");
         connector.source(KOGITO_PROCESSINSTANCES_EVENTS).send(event);
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingKafkaConsumerIT.java
index e31296898c..82fadc8a52 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingKafkaConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
index d9a6e57619..d462d88949 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import java.time.Duration;
@@ -23,6 +25,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.kie.kogito.index.storage.DataIndexStorageService;
 
 import io.restassured.http.ContentType;
@@ -31,6 +34,7 @@
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.is;
 
+@Timeout(10000)
 public abstract class AbstractMessagingConsumerIT {
 
     Duration timeout = Duration.ofSeconds(30);
@@ -70,6 +74,22 @@ void testProcessInstanceEvent() throws Exception {
                                 .body("data.ProcessInstances[0].id", is(processInstanceId)));
     }
 
+    @Test
+    void testProcessDefinitionEvent() throws Exception {
+        sendProcessDefinitionEvent();
+
+        String id = "jsongreet";
+
+        await()
+                .atMost(timeout)
+                .untilAsserted(
+                        () -> given().contentType(ContentType.JSON).body("{ \"query\" : \"{ ProcessDefinitions { id } }\" }")
+                                .when().post("/graphql")
+                                .then().log().ifValidationFails().statusCode(200)
+                                .body("data.ProcessDefinitions.size()", is(1))
+                                .body("data.ProcessDefinitions[0].id", is(id)));
+    }
+
     @Test
     void testUserTaskInstanceEvent() throws Exception {
         sendUserTaskInstanceEvent();
@@ -105,6 +125,8 @@ void testJobEvent() throws Exception {
 
     protected abstract void sendProcessInstanceEvent() throws Exception;
 
+    protected abstract void sendProcessDefinitionEvent() throws Exception;
+
     protected abstract void sendJobEvent() throws Exception;
 
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
index 62212149ea..1f1a4aed39 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
@@ -1,33 +1,43 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import javax.enterprise.inject.Any;
 import javax.inject.Inject;
 
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
+import org.kie.kogito.index.json.JsonUtils;
 import org.kie.kogito.index.model.ProcessInstanceState;
 
 import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
 
-import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.*;
-import static org.kie.kogito.index.test.TestUtils.*;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESS_DEFINITIONS_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
+import static org.kie.kogito.index.test.TestUtils.getJobCloudEvent;
+import static org.kie.kogito.index.test.TestUtils.getProcessCloudEvent;
+import static org.kie.kogito.index.test.TestUtils.getUserTaskCloudEvent;
+import static org.kie.kogito.index.test.TestUtils.readFileContent;
 
 public abstract class AbstractMessagingHttpConsumerIT extends AbstractMessagingConsumerIT {
 
@@ -36,18 +46,23 @@ public abstract class AbstractMessagingHttpConsumerIT extends AbstractMessagingC
     public InMemoryConnector connector;
 
     protected void sendUserTaskInstanceEvent() throws Exception {
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent("45fae435-b098-4f27-97cf-a0c107072e8b", "travels",
+        UserTaskInstanceDataEvent<?> event = getUserTaskCloudEvent("45fae435-b098-4f27-97cf-a0c107072e8b", "travels",
                 "2308e23d-9998-47e9-a772-a078cf5b891b", null, null, "Completed");
         connector.source(KOGITO_USERTASKINSTANCES_EVENTS).send(event);
     }
 
     protected void sendProcessInstanceEvent() throws Exception {
-        ProcessInstanceDataEvent event = getProcessCloudEvent("travels", "2308e23d-9998-47e9-a772-a078cf5b891b",
+        ProcessInstanceDataEvent<?> event = getProcessCloudEvent("travels", "2308e23d-9998-47e9-a772-a078cf5b891b",
                 ProcessInstanceState.ACTIVE, null,
                 null, null, "currentUser");
         connector.source(KOGITO_PROCESSINSTANCES_EVENTS).send(event);
     }
 
+    protected void sendProcessDefinitionEvent() throws Exception {
+        ProcessDefinitionDataEvent event = JsonUtils.getObjectMapper().readValue(readFileContent("process_definition_event.json"), ProcessDefinitionDataEvent.class);
+        connector.source(KOGITO_PROCESS_DEFINITIONS_EVENTS).send(event);
+    }
+
     protected void sendJobEvent() throws Exception {
         KogitoJobCloudEvent event = getJobCloudEvent("8350b8b6-c5d9-432d-a339-a9fc85f642d4_0", "travels",
                 "7c1d9b38-b462-47c5-8bf2-d9154f54957b", null, null, "SCHEDULED");
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingKafkaConsumerIT.java
index 4307b94db2..d398caf2e2 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingKafkaConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -22,6 +24,10 @@
 import org.kie.kogito.test.quarkus.kafka.KafkaTestClient;
 import org.kie.kogito.testcontainers.quarkus.KafkaQuarkusTestResource;
 
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESS_DEFINITIONS_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
 import static org.kie.kogito.index.test.TestUtils.readFileContent;
 
 public abstract class AbstractMessagingKafkaConsumerIT extends AbstractMessagingConsumerIT {
@@ -46,15 +52,19 @@ void close() {
     }
 
     protected void sendUserTaskInstanceEvent() throws Exception {
-        send("user_task_instance_event.json", "kogito-usertaskinstances-events");
+        send("user_task_instance_event.json", KOGITO_USERTASKINSTANCES_EVENTS);
     }
 
     protected void sendProcessInstanceEvent() throws Exception {
-        send("process_instance_event.json", "kogito-processinstances-events");
+        send("process_instance_event.json", KOGITO_PROCESSINSTANCES_EVENTS);
+    }
+
+    protected void sendProcessDefinitionEvent() throws Exception {
+        send("process_definition_event.json", KOGITO_PROCESS_DEFINITIONS_EVENTS);
     }
 
     protected void sendJobEvent() throws Exception {
-        send("job_event.json", "kogito-jobs-events");
+        send("job_event.json", KOGITO_JOBS_EVENTS);
     }
 
     private void send(String file, String topic) throws Exception {
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
index dcab0f098f..fd97ba148a 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import java.time.Duration;
@@ -30,7 +32,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.model.ProcessInstanceState;
 import org.kie.kogito.persistence.protobuf.ProtobufService;
 import org.kie.kogito.test.quarkus.kafka.KafkaTestClient;
@@ -107,17 +109,18 @@ void testMessagingEvents() {
                 String processInstanceId = UUID.randomUUID().toString();
                 String taskId = UUID.randomUUID().toString();
 
-                ProcessInstanceDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
+                ProcessInstanceDataEvent<?> startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, "currentUser");
 
                 sendProcessInstanceEvent(client, startEvent);
 
-                UserTaskInstanceDataEvent userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, "InProgress");
+                UserTaskInstanceDataEvent<?> userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, "InProgress");
                 sendUserTaskEvent(client, userTaskEvent);
 
                 userTaskEvent = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, "Completed");
                 sendUserTaskEvent(client, userTaskEvent);
 
-                ProcessInstanceDataEvent endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, "currentUser");
+                ProcessInstanceDataEvent<?> endEvent = getProcessCloudEvent(processId, processInstanceId, COMPLETED, null, null, null, "currentUser");
+
                 sendProcessInstanceEvent(client, endEvent);
 
                 return processInstanceId;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/DomainEventConsumerTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/DomainEventConsumerTest.java
index 4f3385b0cc..7e303d96cf 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/DomainEventConsumerTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/DomainEventConsumerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import java.util.UUID;
@@ -22,7 +24,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
 import org.kie.kogito.index.model.ProcessInstanceState;
 import org.kie.kogito.index.service.IndexingService;
 import org.mockito.ArgumentCaptor;
@@ -58,7 +62,7 @@ public void setup() {
 
     @Test
     public void testOnUserTaskInstanceDomainEventMappingException() {
-        UserTaskInstanceDataEvent event = mock(UserTaskInstanceDataEvent.class);
+        UserTaskInstanceStateDataEvent event = mock(UserTaskInstanceStateDataEvent.class);
 
         assertThatExceptionOfType(NullPointerException.class).isThrownBy(() -> consumer.onDomainEvent(event));
 
@@ -73,7 +77,7 @@ public void testOnUserTaskInstanceDomainEventIndexingException() {
         String processId = "travels";
         String processInstanceId = UUID.randomUUID().toString();
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, "InProgress");
+        UserTaskInstanceDataEvent<?> event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, "InProgress");
 
         assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> consumer.onDomainEvent(event));
         verify(service).indexModel(any());
@@ -85,7 +89,7 @@ public void testOnUserTaskInstanceEvent() {
         String processId = "travels";
         String processInstanceId = UUID.randomUUID().toString();
 
-        UserTaskInstanceDataEvent event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, "InProgress");
+        UserTaskInstanceDataEvent<?> event = getUserTaskCloudEvent(taskId, processId, processInstanceId, null, null, "InProgress");
 
         consumer.onDomainEvent(event);
 
@@ -100,7 +104,7 @@ public void testOnUserTaskInstanceEvent() {
 
     @Test
     public void testOnProcessInstanceDomainEventMappingException() {
-        ProcessInstanceDataEvent event = mock(ProcessInstanceDataEvent.class);
+        ProcessInstanceStateDataEvent event = mock(ProcessInstanceStateDataEvent.class);
 
         assertThatExceptionOfType(NullPointerException.class).isThrownBy(() -> consumer.onDomainEvent(event));
 
@@ -114,7 +118,7 @@ public void testOnProcessInstanceDomainEventIndexingException() {
         String processId = "travels";
         String processInstanceId = UUID.randomUUID().toString();
 
-        ProcessInstanceDataEvent event = getProcessCloudEvent(processId, processInstanceId, ProcessInstanceState.ACTIVE, null,
+        ProcessInstanceDataEvent<?> event = getProcessCloudEvent(processId, processInstanceId, ProcessInstanceState.ACTIVE, null,
                 null, null, "currentUser");
 
         assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> consumer.onDomainEvent(event));
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
index 174ea1cbfa..064c4f2113 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
@@ -1,44 +1,73 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
+import java.io.IOException;
+import java.net.URI;
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.core.HttpHeaders;
+
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.Metadata;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.kie.kogito.event.process.NodeDefinition;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
-import org.kie.kogito.index.event.ProcessInstanceEventMapper;
-import org.kie.kogito.index.event.UserTaskInstanceEventMapper;
+import org.kie.kogito.index.event.mapper.ProcessDefinitionDataEventMerger;
+import org.kie.kogito.index.event.mapper.ProcessInstanceStateDataEventMerger;
+import org.kie.kogito.index.event.mapper.UserTaskInstanceStateEventMerger;
+import org.kie.kogito.index.json.JsonUtils;
 import org.kie.kogito.index.json.ObjectMapperProducer;
 import org.kie.kogito.index.model.Job;
+import org.kie.kogito.index.model.Node;
+import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.model.UserTaskInstance;
+import org.kie.kogito.jackson.utils.ObjectMapperFactory;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.cloudevents.SpecVersion;
 import io.quarkus.reactivemessaging.http.runtime.IncomingHttpMetadata;
 import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
 
+import static io.cloudevents.core.v1.CloudEventV1.DATACONTENTTYPE;
+import static io.cloudevents.core.v1.CloudEventV1.DATASCHEMA;
+import static io.cloudevents.core.v1.CloudEventV1.ID;
+import static io.cloudevents.core.v1.CloudEventV1.SOURCE;
+import static io.cloudevents.core.v1.CloudEventV1.SPECVERSION;
+import static io.cloudevents.core.v1.CloudEventV1.SUBJECT;
+import static io.cloudevents.core.v1.CloudEventV1.TIME;
+import static io.cloudevents.core.v1.CloudEventV1.TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.kie.kogito.index.test.TestUtils.readFileContent;
@@ -47,24 +76,33 @@
 @ExtendWith(MockitoExtension.class)
 class KogitoIndexEventConverterTest {
 
-    private static final String BINARY_PROCESS_INSTANCE_CLOUD_EVENT_DATA = "process_instance_event.json";
-    private static final String BINARY_PROCESS_INSTANCE_CLOUD_EVENT_BODY_DATA = "binary_process_instance_event_data.json";
-    private static final String BINARY_USER_TASK_INSTANCE_CLOUD_EVENT_DATA = "binary_user_task_instance_event_data.json";
+    private static final String PROCESS_INSTANCE_STATE_EVENT_TYPE = "ProcessInstanceStateDataEvent";
+    private static final String USER_TASK_INSTANCE_STATE_EVENT_TYPE = "UserTaskInstanceStateDataEvent";
+    private static final String JOB_EVENT_TYPE = "JobEvent";
+    private static final String EVENT_ID = "ID";
+    private static final URI EVENT_SOURCE = URI.create("http://localhost:8080/travels");
+    private static final OffsetDateTime EVENT_TIME = OffsetDateTime.parse("2022-03-18T15:33:05.608395+10:00");
+    private static final URI EVENT_DATA_SCHEMA = URI.create("http://my_event_data_schema/my_schema.json");
+    private static final String EVENT_DATA_CONTENT_TYPE = "application/json; charset=utf-8";
+    private static final String EVENT_SUBJECT = "SUBJECT";
+    private static final String STRUCTURED_PROCESS_INSTANCE_CLOUD_EVENT = "process_instance_event.json";
+    private static final String BINARY_PROCESS_INSTANCE_CLOUD_EVENT_DATA = "binary_process_instance_event_data.json";
+    private static final String BINARY_USER_TASK_INSTANCE_CLOUD_EVENT_DATA = "binary_user_task_instance_state_event_data.json";
     private static final String BINARY_KOGITO_JOB_CLOUD_EVENT_DATA = "binary_job_event_data.json";
-    @Mock
-    IncomingHttpMetadata httpMetadata;
+    private static final String STRUCTURED_PROCESS_DEFINITION_CLOUD_EVENT = "process_definition_event.json";
+    private static final String BINARY_PROCESS_DEFINITION_CLOUD_EVENT = "binary_process_definition_event.json";
 
+    @Mock
+    private IncomingHttpMetadata httpMetadata;
     private MultiMap headers;
-
     private KogitoIndexEventConverter converter;
-    private ObjectMapper objectMapper;
 
     @BeforeEach
     void setUp() {
         headers = MultiMap.caseInsensitiveMultiMap();
         lenient().doReturn(headers).when(httpMetadata).getHeaders();
         converter = new KogitoIndexEventConverter();
-        objectMapper = new ObjectMapper();
+        ObjectMapper objectMapper = JsonUtils.getObjectMapper();
         new ObjectMapperProducer().customize(objectMapper);
         converter.setObjectMapper(objectMapper);
     }
@@ -80,94 +118,277 @@ void canConvertBufferPayload() {
 
     @Test
     void canConvertNotBufferPayload() {
-        assertThat(converter.canConvert(Message.of(new ProcessInstanceDataEvent(), Metadata.of(httpMetadata)),
+        assertThat(converter.canConvert(Message.of(new ProcessInstanceDataEvent<>(), Metadata.of(httpMetadata)),
                 ProcessInstanceDataEvent.class)).isFalse();
-        assertThat(converter.canConvert(Message.of(new UserTaskInstanceDataEvent(), Metadata.of(httpMetadata)),
+        assertThat(converter.canConvert(Message.of(new UserTaskInstanceDataEvent<>(), Metadata.of(httpMetadata)),
                 UserTaskInstanceDataEvent.class)).isFalse();
         assertThat(converter.canConvert(Message.of(KogitoJobCloudEvent.builder().build(), Metadata.of(httpMetadata)),
                 KogitoJobCloudEvent.class)).isFalse();
     }
 
     @Test
-    void convertBinaryCloudProcessInstanceEventBody() throws Exception {
-        Buffer buffer = Buffer.buffer(readFileContent(BINARY_PROCESS_INSTANCE_CLOUD_EVENT_BODY_DATA));
+    void convertBinaryProcessDefinitionDataEvent() throws Exception {
+        Buffer buffer = Buffer.buffer(readFileContent(BINARY_PROCESS_DEFINITION_CLOUD_EVENT));
+        Message<?> message = Message.of(buffer, Metadata.of(httpMetadata));
+        // set ce-xxx headers for the binary format.
+        headers.add(ceHeader(SPECVERSION), SpecVersion.V1.toString());
+        headers.add(ceHeader(ID), EVENT_ID);
+        headers.add(ceHeader(SOURCE), EVENT_SOURCE.toString());
+        headers.add(ceHeader(TYPE), ProcessDefinitionDataEvent.PROCESS_DEFINITION_EVENT);
+        headers.add(ceHeader(TIME), EVENT_TIME.toString());
+        headers.add(ceHeader(DATASCHEMA), EVENT_DATA_SCHEMA.toString());
+        headers.add(ceHeader(DATACONTENTTYPE), EVENT_DATA_CONTENT_TYPE);
+        headers.add(ceHeader(SUBJECT), EVENT_SUBJECT);
+
+        Message<?> result = converter.convert(message, ProcessDefinitionDataEvent.class);
+        assertThat(result.getPayload()).isInstanceOf(ProcessDefinitionDataEvent.class);
+        ProcessDefinitionDataEvent cloudEvent = (ProcessDefinitionDataEvent) result.getPayload();
+
+        assertThat(cloudEvent.getId()).isEqualTo(EVENT_ID);
+        assertThat(cloudEvent.getSpecVersion().toString()).isEqualTo(SpecVersion.V1.toString());
+        assertThat(cloudEvent.getSource().toString()).isEqualTo(EVENT_SOURCE.toString());
+        assertThat(cloudEvent.getType()).isEqualTo(ProcessDefinitionDataEvent.PROCESS_DEFINITION_EVENT);
+        assertThat(cloudEvent.getTime()).isEqualTo(EVENT_TIME);
+        assertThat(cloudEvent.getDataSchema()).isEqualTo(EVENT_DATA_SCHEMA);
+        assertThat(cloudEvent.getDataContentType()).isEqualTo(EVENT_DATA_CONTENT_TYPE);
+        assertThat(cloudEvent.getSubject()).isEqualTo(EVENT_SUBJECT);
+
+        assertProcessDefinitionWithEvent(cloudEvent);
+    }
+
+    private static Map<String, String> getMetadata() {
+        return ProcessDefinitionDataEventMerger.toStringMap(
+                Map.of("Description", "JSON based greeting workflow",
+                        "annotations", getAnnotations(),
+                        "Tags", getAnnotations()));
+    }
+
+    private List<Node> getNodes() {
+        try {
+            List<NodeDefinition> nodes = ObjectMapperFactory.get()
+                    .readerForListOf(NodeDefinition.class)
+                    .readValue(readFileContent("nodes_definitions.json"));
+            return nodes.stream().map(definition -> {
+                Node node = new Node();
+                node.setId(definition.getId());
+                node.setName(definition.getName());
+                node.setUniqueId(definition.getUniqueId());
+                node.setType(definition.getType());
+                node.setMetadata(ProcessDefinitionDataEventMerger.toStringMap(definition.getMetadata()));
+                return node;
+            }).collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static List<String> getAnnotations() {
+        return List.of("test1", "test2", "test3");
+    }
+
+    @Test
+    void convertStructuredProcessDefinitionDataEvent() throws Exception {
+        Buffer buffer = Buffer.buffer(readFileContent(STRUCTURED_PROCESS_DEFINITION_CLOUD_EVENT));
+        Message<?> message = Message.of(buffer, Metadata.of(httpMetadata));
+
+        // set ce header for the structured format.
+        headers.add(HttpHeaders.CONTENT_TYPE, "application/cloudevents+json");
+
+        Message<?> result = converter.convert(message, ProcessDefinitionDataEvent.class);
+        assertThat(result.getPayload()).isInstanceOf(ProcessDefinitionDataEvent.class);
+        ProcessDefinitionDataEvent cloudEvent = (ProcessDefinitionDataEvent) result.getPayload();
+
+        assertThat(cloudEvent.getId()).isEqualTo("717af02d-645a-4b27-8058-b67ff1fa8edb");
+        assertThat(cloudEvent.getSpecVersion().toString()).isEqualTo(SpecVersion.V1.toString());
+        assertThat(cloudEvent.getSource().toString()).isEqualTo("http://localhost:8080/jsongreet");
+        assertThat(cloudEvent.getType()).isEqualTo(ProcessDefinitionDataEvent.PROCESS_DEFINITION_EVENT);
+        assertThat(cloudEvent.getTime()).isEqualTo("2023-10-19T10:18:01.540311-03:00");
+
+        assertProcessDefinitionWithEvent(cloudEvent);
+    }
+
+    private void assertProcessDefinitionWithEvent(ProcessDefinitionDataEvent cloudEvent) {
+        ProcessDefinition definition = new ProcessDefinitionDataEventMerger().merge(null, cloudEvent);
+        assertThat(definition.getId()).isEqualTo("jsongreet");
+        assertThat(definition.getVersion()).isEqualTo("1.0");
+        assertThat(definition.getName()).isEqualTo("Greeting workflow");
+        assertThat(definition.getDescription()).isEqualTo("JSON based greeting workflow");
+        assertThat(definition.getEndpoint()).isEqualTo("http://localhost:8080/jsongreet");
+        assertThat(definition.getAnnotations()).containsAll(getAnnotations());
+        assertThat(definition.getNodes()).containsAll(getNodes());
+        assertThat(definition.getMetadata().entrySet()).containsAll(getMetadata().entrySet());
+        assertThat(definition.getType()).isEqualTo("ProcessDefinitionEvent");
+        assertThat(definition.getSource()).isNull();
+    }
+
+    @Test
+    void convertBinaryProcessInstanceDataEvent() throws Exception {
+        Buffer buffer = Buffer.buffer(readFileContent(BINARY_PROCESS_INSTANCE_CLOUD_EVENT_DATA));
         Message<?> message = Message.of(buffer, Metadata.of(httpMetadata));
+
+        // set ce-xxx headers for the binary format.
+        headers.add(ceHeader(SPECVERSION), SpecVersion.V1.toString());
+        headers.add(ceHeader(ID), EVENT_ID);
+        headers.add(ceHeader(SOURCE), EVENT_SOURCE.toString());
+        headers.add(ceHeader(TYPE), PROCESS_INSTANCE_STATE_EVENT_TYPE);
+        headers.add(ceHeader(TIME), EVENT_TIME.toString());
+        headers.add(ceHeader(DATASCHEMA), EVENT_DATA_SCHEMA.toString());
+        headers.add(ceHeader(DATACONTENTTYPE), EVENT_DATA_CONTENT_TYPE);
+        headers.add(ceHeader(SUBJECT), EVENT_SUBJECT);
+
         Message<?> result = converter.convert(message, ProcessInstanceDataEvent.class);
         assertThat(result.getPayload()).isInstanceOf(ProcessInstanceDataEvent.class);
-        ProcessInstanceDataEvent cloudEvent = (ProcessInstanceDataEvent) result.getPayload();
+        ProcessInstanceStateDataEvent cloudEvent = (ProcessInstanceStateDataEvent) result.getPayload();
+
+        assertThat(cloudEvent.getId()).isEqualTo(EVENT_ID);
+        assertThat(cloudEvent.getSpecVersion().toString()).isEqualTo(SpecVersion.V1.toString());
+        assertThat(cloudEvent.getSource().toString()).isEqualTo(EVENT_SOURCE.toString());
+        assertThat(cloudEvent.getType()).isEqualTo(PROCESS_INSTANCE_STATE_EVENT_TYPE);
+        assertThat(cloudEvent.getTime()).isEqualTo(EVENT_TIME);
+        assertThat(cloudEvent.getDataSchema()).isEqualTo(EVENT_DATA_SCHEMA);
+        assertThat(cloudEvent.getDataContentType()).isEqualTo(EVENT_DATA_CONTENT_TYPE);
+        assertThat(cloudEvent.getSubject()).isEqualTo(EVENT_SUBJECT);
 
-        ProcessInstance pi = new ProcessInstanceEventMapper().apply(cloudEvent);
+        ProcessInstance pi = new ProcessInstance();
+        new ProcessInstanceStateDataEventMerger().merge(pi, cloudEvent);
         assertThat(pi.getId()).isEqualTo("5f8b1a48-4d37-4bd2-a1a6-9b8f6097cfdd");
+        assertThat(pi.getVersion()).isEqualTo("1.0");
         assertThat(pi.getProcessId()).isEqualTo("subscription_flow");
-        assertThat(pi.getProcessName()).isEqualTo("workflow");
-        assertThat(pi.getVariables()).hasSize(1);
-        assertThat(pi.getNodes()).hasSize(14);
+        assertThat(pi.getProcessName()).isEqualTo("subscription workflow");
+
+        assertThat(pi.getRootProcessInstanceId()).isEqualTo("root_process_instance_id");
+        assertThat(pi.getRootProcessId()).isEqualTo("root_process_id");
+        assertThat(pi.getParentProcessInstanceId()).isEqualTo("parent_instance_id");
+
+        assertThat(pi.getRoles()).containsExactly("admin", "user");
         assertThat(pi.getState()).isEqualTo(1);
-        assertThat(pi.getStart()).isEqualTo("2023-05-24T10:41:14.911Z");
         assertThat(pi.getEnd()).isNull();
-        assertThat(pi.getMilestones()).isEmpty();
+        assertThat(pi.getBusinessKey()).isEqualTo("business_key");
     }
 
     @Test
-    void convertBinaryCloudProcessInstanceEvent() throws Exception {
-        Buffer buffer = Buffer.buffer(readFileContent(BINARY_PROCESS_INSTANCE_CLOUD_EVENT_DATA));
+    void convertStructuredProcessInstanceDataEvent() throws Exception {
+        Buffer buffer = Buffer.buffer(readFileContent(STRUCTURED_PROCESS_INSTANCE_CLOUD_EVENT));
         Message<?> message = Message.of(buffer, Metadata.of(httpMetadata));
+
+        // set ce header for the structured format.
+        headers.add(HttpHeaders.CONTENT_TYPE, "application/cloudevents+json");
+
         Message<?> result = converter.convert(message, ProcessInstanceDataEvent.class);
         assertThat(result.getPayload()).isInstanceOf(ProcessInstanceDataEvent.class);
-        ProcessInstanceDataEvent cloudEvent = (ProcessInstanceDataEvent) result.getPayload();
+        ProcessInstanceDataEvent<?> cloudEvent = (ProcessInstanceDataEvent<?>) result.getPayload();
+
+        assertThat(cloudEvent.getId()).isEqualTo("867ff7b4-2e49-49b3-882a-76f65a2c4124");
+        assertThat(cloudEvent.getSpecVersion().toString()).isEqualTo(SpecVersion.V1.toString());
+        assertThat(cloudEvent.getSource().toString()).isEqualTo(EVENT_SOURCE.toString());
+        assertThat(cloudEvent.getType()).isEqualTo(PROCESS_INSTANCE_STATE_EVENT_TYPE);
+        assertThat(cloudEvent.getTime()).isEqualTo(EVENT_TIME);
 
-        ProcessInstance pi = new ProcessInstanceEventMapper().apply(cloudEvent);
+        ProcessInstance pi = new ProcessInstance();
+        new ProcessInstanceStateDataEventMerger().merge(pi, cloudEvent);
         assertThat(pi.getId()).isEqualTo("2308e23d-9998-47e9-a772-a078cf5b891b");
+        assertThat(pi.getVersion()).isEqualTo("1.0");
         assertThat(pi.getProcessId()).isEqualTo("travels");
         assertThat(pi.getProcessName()).isEqualTo("travels");
-        assertThat(pi.getVariables()).hasSize(3);
-        assertThat(pi.getNodes()).hasSize(5);
         assertThat(pi.getState()).isEqualTo(1);
+        assertThat(pi.getBusinessKey()).isEqualTo("F7RTPS");
         assertThat(pi.getStart()).isEqualTo("2022-03-18T05:32:21.887Z");
         assertThat(pi.getEnd()).isNull();
-        assertThat(pi.getMilestones()).isEmpty();
     }
 
     @Test
-    void convertBinaryCloudKogitoJobEvent() throws Exception {
+    void convertBinaryKogitoJobCloudEvent() throws Exception {
         Buffer buffer = Buffer.buffer(readFileContent(BINARY_KOGITO_JOB_CLOUD_EVENT_DATA));
         Message<?> message = Message.of(buffer, Metadata.of(httpMetadata));
+
+        // set ce-xxx headers for the binary format.
+        headers.add(ceHeader(SPECVERSION), SpecVersion.V1.toString());
+        headers.add(ceHeader(ID), EVENT_ID);
+        headers.add(ceHeader(SOURCE), EVENT_SOURCE.toString());
+        headers.add(ceHeader(TYPE), JOB_EVENT_TYPE);
+        headers.add(ceHeader(TIME), EVENT_TIME.toString());
+        headers.add(ceHeader(DATASCHEMA), EVENT_DATA_SCHEMA.toString());
+        headers.add(ceHeader(DATACONTENTTYPE), EVENT_DATA_CONTENT_TYPE);
+        headers.add(ceHeader(SUBJECT), EVENT_SUBJECT);
+
         Message<?> result = converter.convert(message, KogitoJobCloudEvent.class);
         assertThat(result.getPayload()).isInstanceOf(KogitoJobCloudEvent.class);
         KogitoJobCloudEvent cloudEvent = (KogitoJobCloudEvent) result.getPayload();
 
+        assertThat(cloudEvent.getId()).isEqualTo(EVENT_ID);
+        assertThat(cloudEvent.getSpecVersion()).isEqualTo(SpecVersion.V1.toString());
+        assertThat(cloudEvent.getSource().toString()).isEqualTo(EVENT_SOURCE.toString());
+        assertThat(cloudEvent.getType()).isEqualTo(JOB_EVENT_TYPE);
+        assertThat(cloudEvent.getTime()).isEqualTo(EVENT_TIME.toZonedDateTime());
+        assertThat(cloudEvent.getSchemaURL()).isEqualTo(EVENT_DATA_SCHEMA);
+        assertThat(cloudEvent.getContentType()).isEqualTo(EVENT_DATA_CONTENT_TYPE);
+        assertThat(cloudEvent.getSubject()).isEqualTo(EVENT_SUBJECT);
+
         Job job = cloudEvent.getData();
         assertThat(job.getId()).isEqualTo("8350b8b6-c5d9-432d-a339-a9fc85f642d4_0");
         assertThat(job.getProcessId()).isEqualTo("timerscycle");
         assertThat(job.getProcessInstanceId()).isEqualTo("7c1d9b38-b462-47c5-8bf2-d9154f54957b");
-        assertThat(job.getRepeatInterval()).isEqualTo(1000l);
+        assertThat(job.getRootProcessId()).isEqualTo("root_process_id");
+        assertThat(job.getRootProcessInstanceId()).isEqualTo("root_process_instance_id");
+        assertThat(job.getNodeInstanceId()).isEqualTo("node_instance_id");
+        assertThat(job.getRepeatInterval()).isEqualTo(1000);
         assertThat(job.getCallbackEndpoint())
                 .isEqualTo("http://localhost:8080/management/jobs/timerscycle/instances/7c1d9b38-b462-47c5-8bf2-d9154f54957b/timers/8350b8b6-c5d9-432d-a339-a9fc85f642d4_0");
-        assertThat(job.getScheduledId()).isEqualTo("0");
+        assertThat(job.getScheduledId()).isEqualTo("1234");
         assertThat(job.getStatus()).isEqualTo("SCHEDULED");
-
+        assertThat(job.getRepeatInterval()).isEqualTo(1000);
+        assertThat(job.getRepeatLimit()).isEqualTo(2147483647);
+        assertThat(job.getRetries()).isEqualTo(0);
+        assertThat(job.getExecutionCounter()).isEqualTo(0);
     }
 
     @Test
-    void convertBinaryCloudUserTaskInstanceEvent() throws Exception {
+    void convertBinaryUserTaskInstanceDataEvent() throws Exception {
         Buffer buffer = Buffer.buffer(readFileContent(BINARY_USER_TASK_INSTANCE_CLOUD_EVENT_DATA));
         Message<?> message = Message.of(buffer, Metadata.of(httpMetadata));
+
+        // set ce-xxx headers for the binary format.
+        headers.add(ceHeader(SPECVERSION), SpecVersion.V1.toString());
+        headers.add(ceHeader(ID), EVENT_ID);
+        headers.add(ceHeader(SOURCE), EVENT_SOURCE.toString());
+        headers.add(ceHeader(TYPE), USER_TASK_INSTANCE_STATE_EVENT_TYPE);
+        headers.add(ceHeader(TIME), EVENT_TIME.toString());
+        headers.add(ceHeader(DATASCHEMA), EVENT_DATA_SCHEMA.toString());
+        headers.add(ceHeader(DATACONTENTTYPE), EVENT_DATA_CONTENT_TYPE);
+        headers.add(ceHeader(SUBJECT), EVENT_SUBJECT);
+
         Message<?> result = converter.convert(message, UserTaskInstanceDataEvent.class);
-        assertThat(result.getPayload()).isInstanceOf(UserTaskInstanceDataEvent.class);
-        UserTaskInstanceDataEvent cloudEvent = (UserTaskInstanceDataEvent) result.getPayload();
+        assertThat(result.getPayload()).isInstanceOf(UserTaskInstanceStateDataEvent.class);
+        UserTaskInstanceStateDataEvent cloudEvent = (UserTaskInstanceStateDataEvent) result.getPayload();
 
-        UserTaskInstance userTaskInstance = new UserTaskInstanceEventMapper().apply(cloudEvent);
-        assertThat(userTaskInstance.getId()).isEqualTo("45fae435-b098-4f27-97cf-a0c107072e8b");
+        assertThat(cloudEvent.getId()).isEqualTo(EVENT_ID);
+        assertThat(cloudEvent.getSpecVersion()).isEqualTo(SpecVersion.V1);
+        assertThat(cloudEvent.getSource().toString()).isEqualTo(EVENT_SOURCE.toString());
+        assertThat(cloudEvent.getType()).isEqualTo(USER_TASK_INSTANCE_STATE_EVENT_TYPE);
+        assertThat(cloudEvent.getTime()).isEqualTo(EVENT_TIME);
+        assertThat(cloudEvent.getDataSchema()).isEqualTo(EVENT_DATA_SCHEMA);
+        assertThat(cloudEvent.getDataContentType()).isEqualTo(EVENT_DATA_CONTENT_TYPE);
+        assertThat(cloudEvent.getSubject()).isEqualTo(EVENT_SUBJECT);
 
-        assertThat(userTaskInstance.getInputs().size()).isEqualTo(6);
+        UserTaskInstance userTaskInstance = new UserTaskInstance();
+        new UserTaskInstanceStateEventMerger().merge(userTaskInstance, cloudEvent);
+        assertThat(userTaskInstance.getId()).isEqualTo("45fae435-b098-4f27-97cf-a0c107072e8b");
+        assertThat(userTaskInstance.getProcessInstanceId()).isEqualTo("67fb3435-b098-4f27-97cf-a0c107072e8b");
         assertThat(userTaskInstance.getName()).isEqualTo("VisaApplication");
+        assertThat(userTaskInstance.getDescription()).isEqualTo("This task is for applying to a visa");
+        assertThat(userTaskInstance.getReferenceName()).isEqualTo("Apply for visa");
+        assertThat(userTaskInstance.getPriority()).isEqualTo("1");
         assertThat(userTaskInstance.getState()).isEqualTo("Completed");
     }
 
     @Test
-    void convertFailureBinaryUnexpectedBufferContent() throws Exception {
+    void convertFailureBinaryUnexpectedBufferContent() {
         Buffer buffer = Buffer.buffer("unexpected Content");
         Message<?> message = Message.of(buffer, Metadata.of(httpMetadata));
         assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> converter.convert(message, ProcessInstanceDataEvent.class));
     }
+
+    private static String ceHeader(String name) {
+        return "ce-" + name;
+    }
 }
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
index 7fc8e7dd61..3669c0550c 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.messaging;
 
@@ -23,7 +26,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.event.DataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
 import org.kie.kogito.index.model.ProcessInstanceState;
 import org.kie.kogito.index.service.IndexingService;
@@ -67,7 +70,7 @@ public void testOnProcessInstanceEvent() {
                 .withSubscriber(UniAssertSubscriber.create());
 
         future.awaitItem().assertCompleted();
-        verify(service).indexProcessInstance(any());
+        verify(service).indexProcessInstanceEvent(any());
         verify(eventPublisher).fire(event);
     }
 
@@ -84,33 +87,33 @@ public void testOnUserTaskInstanceEvent() {
                 .withSubscriber(UniAssertSubscriber.create());
 
         future.awaitItem().assertCompleted();
-        verify(service).indexUserTaskInstance(any());
+        verify(service).indexUserTaskInstanceEvent(any());
         verify(eventPublisher).fire(event);
     }
 
     @Test
     public void testOnProcessInstanceEventException() {
         ProcessInstanceDataEvent event = mock(ProcessInstanceDataEvent.class);
-        doThrow(new RuntimeException("")).when(service).indexProcessInstance(any());
+        doThrow(new RuntimeException("")).when(service).indexProcessInstanceEvent(any());
 
         UniAssertSubscriber<Void> future = consumer.onProcessInstanceEvent(event).subscribe()
                 .withSubscriber(UniAssertSubscriber.create());
 
         future.awaitFailure().assertFailedWith(RuntimeException.class, "");
-        verify(service).indexProcessInstance(any());
+        verify(service).indexProcessInstanceEvent(any());
         verify(eventPublisher, never()).fire(event);
     }
 
     @Test
     public void testOnUserTaskInstanceEventException() {
         UserTaskInstanceDataEvent event = mock(UserTaskInstanceDataEvent.class);
-        doThrow(new RuntimeException("")).when(service).indexUserTaskInstance(any());
+        doThrow(new RuntimeException("")).when(service).indexUserTaskInstanceEvent(any());
 
         UniAssertSubscriber<Void> future = consumer.onUserTaskInstanceEvent(event).subscribe()
                 .withSubscriber(UniAssertSubscriber.create());
 
         future.awaitFailure().assertFailedWith(RuntimeException.class, "");
-        verify(service).indexUserTaskInstance(any());
+        verify(service).indexUserTaskInstanceEvent(any());
         verify(eventPublisher, never()).fire(event);
     }
 
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
index 8ba74733fa..f23cffea36 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.HashMap;
@@ -25,6 +27,7 @@
 
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
+import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESS_DEFINITIONS_EVENTS;
 import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
 
 public class InMemoryMessagingTestResource implements QuarkusTestResourceLifecycleManager {
@@ -32,7 +35,7 @@ public class InMemoryMessagingTestResource implements QuarkusTestResourceLifecyc
     @Override
     public Map<String, String> start() {
         Map<String, String> env = new HashMap<>();
-        Stream.of(KOGITO_PROCESSINSTANCES_EVENTS, KOGITO_USERTASKINSTANCES_EVENTS, KOGITO_JOBS_EVENTS)
+        Stream.of(KOGITO_PROCESSINSTANCES_EVENTS, KOGITO_PROCESS_DEFINITIONS_EVENTS, KOGITO_USERTASKINSTANCES_EVENTS, KOGITO_JOBS_EVENTS)
                 .forEach(s -> env.putAll(switchIncomingChannel(s)));
         return env;
     }
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/vertx/VertxRouterSetupTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/vertx/VertxRouterSetupTest.java
index 0c9549aba4..a880f33bec 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/vertx/VertxRouterSetupTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/vertx/VertxRouterSetupTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.vertx;
 
 import java.util.function.Function;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/META-INF/beans.xml b/data-index/data-index-service/data-index-service-common/src/test/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/resources/META-INF/beans.xml
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_job_event_data.json b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_job_event_data.json
index 849b1f9005..eb75e357ee 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_job_event_data.json
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_job_event_data.json
@@ -4,16 +4,15 @@
   "priority": 0,
   "callbackEndpoint": "http://localhost:8080/management/jobs/timerscycle/instances/7c1d9b38-b462-47c5-8bf2-d9154f54957b/timers/8350b8b6-c5d9-432d-a339-a9fc85f642d4_0",
   "processInstanceId": "7c1d9b38-b462-47c5-8bf2-d9154f54957b",
-  "rootProcessInstanceId": null,
+  "rootProcessInstanceId": "root_process_instance_id",
   "processId": "timerscycle",
-  "rootProcessId": null,
+  "rootProcessId": "root_process_id",
+  "nodeInstanceId": "node_instance_id",
   "repeatInterval": 1000,
   "repeatLimit": 2147483647,
-  "scheduledId": "0",
+  "scheduledId": "1234",
   "retries": 0,
   "status": "SCHEDULED",
   "lastUpdate": "2020-01-16T20:40:58.206Z",
-  "executionCounter": 0,
-  "executionResponse": null,
-  "nodeInstanceId": "54e66e2f-2acd-4d47-b8e6-991cb6372ad8"
+  "executionCounter": 0
 }
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_process_definition_event.json b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_process_definition_event.json
new file mode 100644
index 0000000000..2a4515d015
--- /dev/null
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_process_definition_event.json
@@ -0,0 +1,154 @@
+{
+    "id": "jsongreet",
+    "name": "Greeting workflow",
+    "description": "JSON based greeting workflow",
+    "version": "1.0",
+    "type": "ProcessDefinitionEvent",
+    "roles": null,
+    "addons": [
+      "source-files",
+      "cloudevents"
+    ],
+    "annotations": [
+      "test1",
+      "test2",
+      "test3"
+    ],
+    "endpoint": "http://localhost:8080/jsongreet",
+    "source": null,
+    "metadata": {
+      "Description": "JSON based greeting workflow",
+      "annotations": [
+        "test1",
+        "test2",
+        "test3"
+      ],
+      "Tags": [
+        "test1",
+        "test2",
+        "test3"
+      ]
+    },
+    "nodes": [
+      {
+        "id": "1",
+        "name": "Start",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-12",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-12",
+          "state": "ChooseOnLanguage"
+        }
+      },
+      {
+        "id": "2",
+        "name": "End",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-13",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-13",
+          "state": "GreetPerson"
+        }
+      },
+      {
+        "id": "3",
+        "name": "ChooseOnLanguage",
+        "type": "INTERNAL",
+        "uniqueId": "3",
+        "metadata": {
+          "UniqueId": "3",
+          "Variable": "workflowdata",
+          "state": "ChooseOnLanguage",
+          "Default": "3_12"
+        }
+      },
+      {
+        "id": "4",
+        "name": "GreetInEnglish",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-15",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-15",
+          "state": "GreetInEnglish"
+        }
+      },
+      {
+        "id": "5",
+        "name": "GreetInSpanish",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-16",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-16",
+          "state": "GreetInSpanish"
+        }
+      },
+      {
+        "id": "6",
+        "name": "GreetPerson",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-17",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-17",
+          "state": "GreetPerson"
+        }
+      },
+      {
+        "id": "7",
+        "name": "EmbeddedStart",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-18",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-18"
+        }
+      },
+      {
+        "id": "9",
+        "name": "greetFunction",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-19",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-19",
+          "action": "greetAction",
+          "state": "GreetPerson"
+        }
+      },
+      {
+        "id": "10",
+        "name": "Script",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-20",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-20"
+        }
+      },
+      {
+        "id": "11",
+        "name": "EmbeddedEnd",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-21",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-21"
+        }
+      },
+      {
+        "id": "12",
+        "name": "Join-GreetInEnglish",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-22",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-22",
+          "state": "GreetInEnglish"
+        }
+      },
+      {
+        "id": "13",
+        "name": "Join-GreetPerson",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-23",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-23",
+          "state": "GreetPerson"
+        }
+      }
+    ]
+}
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_process_instance_event_data.json b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_process_instance_event_data.json
index 23d60bf577..ecfc27f4ca 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_process_instance_event_data.json
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_process_instance_event_data.json
@@ -1,154 +1,16 @@
 {
-  "id": "5f8b1a48-4d37-4bd2-a1a6-9b8f6097cfdd",
-  "version": "1.0",
-  "parentInstanceId": null,
-  "rootInstanceId": null,
+  "eventDate" :  1698332756677,
+  "eventUser" : "admin",
+  "eventType" : 1,
   "processId": "subscription_flow",
+  "processVersion": "1.0",
   "processType": null,
-  "rootProcessId": null,
-  "processName": "workflow",
-  "startDate": "2023-05-24T10:41:14.911+00:00",
-  "endDate": null,
-  "state": 1,
-  "businessKey": null,
-  "nodeInstances": [
-    {
-      "id": "f9c80fd0-ce2c-47fc-98b5-c0a0bae6d135",
-      "nodeId": "12",
-      "nodeDefinitionId": "_jbpm-unique-10",
-      "nodeName": "SubscribeAndWaitForConfirmation",
-      "nodeType": "CompositeContextNode",
-      "triggerTime": "2023-05-24T10:41:18.072+00:00",
-      "leaveTime": null
-    },
-    {
-      "id": "e97058a4-4696-4370-92a1-fd5e0e5bf6dd",
-      "nodeId": "18",
-      "nodeDefinitionId": "_jbpm-unique-14",
-      "nodeName": "ConfirmSubscriptionEvent",
-      "nodeType": "EventNode",
-      "triggerTime": "2023-05-24T10:41:18.177+00:00",
-      "leaveTime": null
-    },
-    {
-      "id": "595f9a28-3a26-4b81-851d-ac5f545f8648",
-      "nodeId": "22",
-      "nodeDefinitionId": "22",
-      "nodeName": "TimerNode_22",
-      "nodeType": "TimerNode",
-      "triggerTime": "2023-05-24T10:41:18.178+00:00",
-      "leaveTime": null
-    },
-    {
-      "id": "aaabaf9b-011d-4e92-b4a5-fcc7f52a41e0",
-      "nodeId": "20",
-      "nodeDefinitionId": "20",
-      "nodeName": "EventSplit_20",
-      "nodeType": "Split",
-      "triggerTime": "2023-05-24T10:41:18.175+00:00",
-      "leaveTime": null
-    },
-    {
-      "id": "c194555f-5972-4dc4-b3d7-de871ddc7aee",
-      "nodeId": "16",
-      "nodeDefinitionId": "_jbpm-unique-13",
-      "nodeName": "Script",
-      "nodeType": "ActionNode",
-      "triggerTime": "2023-05-24T10:41:18.174+00:00",
-      "leaveTime": "2023-05-24T10:41:18.174+00:00"
-    },
-    {
-      "id": "732d2190-4bee-4ba9-926f-e8f623298940",
-      "nodeId": "15",
-      "nodeDefinitionId": "_jbpm-unique-12",
-      "nodeName": "subscribeToNewsletter",
-      "nodeType": "WorkItemNode",
-      "triggerTime": "2023-05-24T10:41:18.072+00:00",
-      "leaveTime": "2023-05-24T10:41:18.174+00:00"
-    },
-    {
-      "id": "24af64d1-4660-4972-8794-21b6a8ca3f4a",
-      "nodeId": "13",
-      "nodeDefinitionId": "_jbpm-unique-11",
-      "nodeName": "EmbeddedStart",
-      "nodeType": "StartNode",
-      "triggerTime": "2023-05-24T10:41:18.072+00:00",
-      "leaveTime": "2023-05-24T10:41:18.072+00:00"
-    },
-    {
-      "id": "409bd8d1-27c5-4d84-83a8-af5d49723dac",
-      "nodeId": "11",
-      "nodeDefinitionId": "11",
-      "nodeName": "ExitIfEmailExists",
-      "nodeType": "Split",
-      "triggerTime": "2023-05-24T10:41:18.029+00:00",
-      "leaveTime": "2023-05-24T10:41:18.072+00:00"
-    },
-    {
-      "id": "2bd100e5-156b-4ace-9d99-c50f14b8b345",
-      "nodeId": "5",
-      "nodeDefinitionId": "_jbpm-unique-4",
-      "nodeName": "VerifyEmail",
-      "nodeType": "CompositeContextNode",
-      "triggerTime": "2023-05-24T10:41:14.917+00:00",
-      "leaveTime": "2023-05-24T10:41:18.029+00:00"
-    },
-    {
-      "id": "8c0fc962-5f03-41f8-8f28-c7277619fa54",
-      "nodeId": "10",
-      "nodeDefinitionId": "_jbpm-unique-8",
-      "nodeName": "EmbeddedEnd",
-      "nodeType": "EndNode",
-      "triggerTime": "2023-05-24T10:41:18.028+00:00",
-      "leaveTime": "2023-05-24T10:41:18.028+00:00"
-    },
-    {
-      "id": "25f47359-aeba-46f9-a86d-e271b050c0a4",
-      "nodeId": "9",
-      "nodeDefinitionId": "_jbpm-unique-7",
-      "nodeName": "Script",
-      "nodeType": "ActionNode",
-      "triggerTime": "2023-05-24T10:41:18.023+00:00",
-      "leaveTime": "2023-05-24T10:41:18.028+00:00"
-    },
-    {
-      "id": "22443d26-da1c-4fda-b2ec-b84bd2a8d949",
-      "nodeId": "8",
-      "nodeDefinitionId": "_jbpm-unique-6",
-      "nodeName": "verifyEmail",
-      "nodeType": "WorkItemNode",
-      "triggerTime": "2023-05-24T10:41:14.922+00:00",
-      "leaveTime": "2023-05-24T10:41:18.023+00:00"
-    },
-    {
-      "id": "f9f6d1ab-5879-4eb3-9d52-4c66c98b87f9",
-      "nodeId": "6",
-      "nodeDefinitionId": "_jbpm-unique-5",
-      "nodeName": "EmbeddedStart",
-      "nodeType": "StartNode",
-      "triggerTime": "2023-05-24T10:41:14.917+00:00",
-      "leaveTime": "2023-05-24T10:41:14.922+00:00"
-    },
-    {
-      "id": "e6befc33-dfa4-4667-89dc-5821c96861b9",
-      "nodeId": "1",
-      "nodeDefinitionId": "_jbpm-unique-0",
-      "nodeName": "Start",
-      "nodeType": "StartNode",
-      "triggerTime": "2023-05-24T10:41:14.914+00:00",
-      "leaveTime": "2023-05-24T10:41:14.916+00:00"
-    }
-  ],
-  "variables": {
-    "workflowdata": {
-      "email": "test2@ge.com",
-      "name": "test2",
-      "emailExists": false,
-      "id": "5f8b1a48-4d37-4bd2-a1a6-9b8f6097cfdd",
-      "verified": false
-    }
-  },
-  "error": null,
-  "roles": null,
-  "milestones": []
+  "processInstanceId":  "5f8b1a48-4d37-4bd2-a1a6-9b8f6097cfdd",
+  "businessKey" :  "business_key",
+  "processName": "subscription workflow",
+  "parentInstanceId": "parent_instance_id",
+  "rootProcessId" : "root_process_id",
+  "rootProcessInstanceId" :  "root_process_instance_id",
+  "state" :  1,
+  "roles":  ["admin", "user"]
 }
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_user_task_instance_event_data.json b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_user_task_instance_event_data.json
deleted file mode 100644
index 46620b51c5..0000000000
--- a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_user_task_instance_event_data.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "id": "45fae435-b098-4f27-97cf-a0c107072e8b",
-  "taskName": "VisaApplication",
-  "taskDescription": null,
-  "taskPriority": "1",
-  "referenceName": "Apply for visa",
-  "startDate": "2022-03-18T15:32:22.484+10:00",
-  "completeDate": "2022-03-18T15:33:05.586+10:00",
-  "state": "Completed",
-  "actualOwner": null,
-  "potentialUsers": [],
-  "potentialGroups": [],
-  "excludedUsers": [],
-  "adminUsers": [],
-  "adminGroups": [],
-  "inputs": {
-    "trip": {
-      "city": "Brisbane",
-      "country": "Australia",
-      "begin": "2022-03-01T08:00:00.000+10:00",
-      "end": "2022-03-31T08:00:00.000+10:00",
-      "visaRequired": true
-    },
-    "NodeName": "Apply for visa",
-    "TaskName": "VisaApplication",
-    "Priority": "1",
-    "Skippable": "true",
-    "traveller": {
-      "firstName": "Test",
-      "lastName": "Test",
-      "email": "test@email.com",
-      "nationality": "Brazilian",
-      "address": {
-        "street": "",
-        "city": "",
-        "zipCode": "",
-        "country": "Brazil"
-      }
-    }
-  },
-  "outputs": {
-    "ActorId": null,
-    "visaApplication": {
-      "firstName": "Test",
-      "lastName": "Test",
-      "city": "Brisbane",
-      "country": "Australia",
-      "duration": 150,
-      "passportNumber": "CDDCDCDS",
-      "nationality": "Brazilian",
-      "approved": false
-    }
-  },
-  "comments": [],
-  "attachments": [],
-  "processInstanceId": "2308e23d-9998-47e9-a772-a078cf5b891b",
-  "rootProcessInstanceId": "",
-  "processId": "travels",
-  "rootProcessId": ""
-}
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/binary_user_task_instance_state_event_data.json b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_user_task_instance_state_event_data.json
new file mode 100644
index 0000000000..eaae160983
--- /dev/null
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/binary_user_task_instance_state_event_data.json
@@ -0,0 +1,14 @@
+{
+  "eventDate" : 1698332756677,
+  "eventUser" : "admin",
+  "userTaskDefinitionId" : "task_123",
+  "userTaskInstanceId" : "45fae435-b098-4f27-97cf-a0c107072e8b",
+  "userTaskName": "VisaApplication",
+  "eventType": 1,
+  "userTaskDescription" : "This task is for applying to a visa",
+  "userTaskPriority": "1",
+  "userTaskReferenceName": "Apply for visa",
+  "state" : "Completed",
+  "actualOwner" : "admin",
+  "processInstanceId" : "67fb3435-b098-4f27-97cf-a0c107072e8b"
+}
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/nodes_definitions.json b/data-index/data-index-service/data-index-service-common/src/test/resources/nodes_definitions.json
new file mode 100644
index 0000000000..5dca9f9ac4
--- /dev/null
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/nodes_definitions.json
@@ -0,0 +1,122 @@
+[
+  {
+    "id": "1",
+    "name": "Start",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-12",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-12",
+      "state": "ChooseOnLanguage"
+    }
+  },
+  {
+    "id": "2",
+    "name": "End",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-13",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-13",
+      "state": "GreetPerson"
+    }
+  },
+  {
+    "id": "3",
+    "name": "ChooseOnLanguage",
+    "type": "INTERNAL",
+    "uniqueId": "3",
+    "metadata": {
+      "UniqueId": "3",
+      "Variable": "workflowdata",
+      "state": "ChooseOnLanguage",
+      "Default": "3_12"
+    }
+  },
+  {
+    "id": "4",
+    "name": "GreetInEnglish",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-15",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-15",
+      "state": "GreetInEnglish"
+    }
+  },
+  {
+    "id": "5",
+    "name": "GreetInSpanish",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-16",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-16",
+      "state": "GreetInSpanish"
+    }
+  },
+  {
+    "id": "6",
+    "name": "GreetPerson",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-17",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-17",
+      "state": "GreetPerson"
+    }
+  },
+  {
+    "id": "7",
+    "name": "EmbeddedStart",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-18",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-18"
+    }
+  },
+  {
+    "id": "9",
+    "name": "greetFunction",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-19",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-19",
+      "action": "greetAction",
+      "state": "GreetPerson"
+    }
+  },
+  {
+    "id": "10",
+    "name": "Script",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-20",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-20"
+    }
+  },
+  {
+    "id": "11",
+    "name": "EmbeddedEnd",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-21",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-21"
+    }
+  },
+  {
+    "id": "12",
+    "name": "Join-GreetInEnglish",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-22",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-22",
+      "state": "GreetInEnglish"
+    }
+  },
+  {
+    "id": "13",
+    "name": "Join-GreetPerson",
+    "type": "INTERNAL",
+    "uniqueId": "_jbpm-unique-23",
+    "metadata": {
+      "UniqueId": "_jbpm-unique-23",
+      "state": "GreetPerson"
+    }
+  }
+]
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/process_definition_event.json b/data-index/data-index-service/data-index-service-common/src/test/resources/process_definition_event.json
new file mode 100644
index 0000000000..b76b7c1869
--- /dev/null
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/process_definition_event.json
@@ -0,0 +1,162 @@
+{
+  "id": "717af02d-645a-4b27-8058-b67ff1fa8edb",
+  "source": "http://localhost:8080/jsongreet",
+  "type": "ProcessDefinitionEvent",
+  "time": "2023-10-19T10:18:01.540311-03:00",
+  "data": {
+    "id": "jsongreet",
+    "name": "Greeting workflow",
+    "description": "JSON based greeting workflow",
+    "version": "1.0",
+    "type": "ProcessDefinitionEvent",
+    "roles": null,
+    "addons": [
+      "source-files",
+      "cloudevents"
+    ],
+    "annotations": [
+      "test2",
+      "test3",
+      "test1"
+    ],
+    "endpoint": "http://localhost:8080/jsongreet",
+    "source": null,
+    "metadata": {
+      "Description": "JSON based greeting workflow",
+      "annotations": [
+        "test1",
+        "test2",
+        "test3"
+      ],
+      "Tags": [
+        "test1",
+        "test2",
+        "test3"
+      ]
+    },
+    "nodes": [
+      {
+        "id": "1",
+        "name": "Start",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-12",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-12",
+          "state": "ChooseOnLanguage"
+        }
+      },
+      {
+        "id": "2",
+        "name": "End",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-13",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-13",
+          "state": "GreetPerson"
+        }
+      },
+      {
+        "id": "3",
+        "name": "ChooseOnLanguage",
+        "type": "INTERNAL",
+        "uniqueId": "3",
+        "metadata": {
+          "UniqueId": "3",
+          "Variable": "workflowdata",
+          "state": "ChooseOnLanguage",
+          "Default": "3_12"
+        }
+      },
+      {
+        "id": "4",
+        "name": "GreetInEnglish",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-15",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-15",
+          "state": "GreetInEnglish"
+        }
+      },
+      {
+        "id": "5",
+        "name": "GreetInSpanish",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-16",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-16",
+          "state": "GreetInSpanish"
+        }
+      },
+      {
+        "id": "6",
+        "name": "GreetPerson",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-17",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-17",
+          "state": "GreetPerson"
+        }
+      },
+      {
+        "id": "7",
+        "name": "EmbeddedStart",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-18",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-18"
+        }
+      },
+      {
+        "id": "9",
+        "name": "greetFunction",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-19",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-19",
+          "action": "greetAction",
+          "state": "GreetPerson"
+        }
+      },
+      {
+        "id": "10",
+        "name": "Script",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-20",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-20"
+        }
+      },
+      {
+        "id": "11",
+        "name": "EmbeddedEnd",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-21",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-21"
+        }
+      },
+      {
+        "id": "12",
+        "name": "Join-GreetInEnglish",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-22",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-22",
+          "state": "GreetInEnglish"
+        }
+      },
+      {
+        "id": "13",
+        "name": "Join-GreetPerson",
+        "type": "INTERNAL",
+        "uniqueId": "_jbpm-unique-23",
+        "metadata": {
+          "UniqueId": "_jbpm-unique-23",
+          "state": "GreetPerson"
+        }
+      }
+    ]
+  },
+  "specversion": "1.0",
+  "kogitoprocid": "jsongreet"
+}
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/process_instance_event.json b/data-index/data-index-service/data-index-service-common/src/test/resources/process_instance_event.json
index daf703b4f9..8b91918159 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/resources/process_instance_event.json
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/process_instance_event.json
@@ -1,105 +1,23 @@
 {
   "id": "867ff7b4-2e49-49b3-882a-76f65a2c4124",
   "source": "http://localhost:8080/travels",
-  "type": "ProcessInstanceEvent",
+  "type": "ProcessInstanceStateDataEvent",
   "time": "2022-03-18T15:33:05.608395+10:00",
   "data": {
-    "id": "2308e23d-9998-47e9-a772-a078cf5b891b",
+    "processInstanceId": "2308e23d-9998-47e9-a772-a078cf5b891b",
     "parentInstanceId": "",
-    "rootInstanceId": "",
+    "rootProcessInstanceId": "",
     "processId": "travels",
-    "version": "1.0",
+    "processVersion": "1.0",
     "rootProcessId": "",
     "processName": "travels",
-    "startDate": "2022-03-18T15:32:21.887+10:00",
-    "endDate": null,
+    "eventDate": "2022-03-18T15:32:21.887+10:00",
     "state": 1,
-    "businessKey": "F7RTPS",
-    "nodeInstances": [
-      {
-        "id": "2b407977-cab4-41ec-b1e6-c34076d9381a",
-        "nodeId": "3",
-        "nodeDefinitionId": "_E611283E-30B0-46B9-8305-768A002C7518",
-        "nodeName": "visasrejected",
-        "nodeType": "EventNode",
-        "triggerTime": "2022-03-18T15:33:05.597+10:00",
-        "leaveTime": null
-      },
-      {
-        "id": "808f4f5e-6473-448e-aac6-ee1017610c1f",
-        "nodeId": "4",
-        "nodeDefinitionId": "_7F75E8BD-3032-47EC-814F-66B197CA99C5",
-        "nodeName": "visasapproved",
-        "nodeType": "EventNode",
-        "triggerTime": "2022-03-18T15:33:05.597+10:00",
-        "leaveTime": null
-      },
-      {
-        "id": "2c644506-a5c6-475e-8098-26980d08f796",
-        "nodeId": "13",
-        "nodeDefinitionId": "_A8C9F331-8433-411D-91DB-B2060D4F8D14",
-        "nodeName": "wait for visa decision",
-        "nodeType": "Split",
-        "triggerTime": "2022-03-18T15:33:05.595+10:00",
-        "leaveTime": null
-      },
-      {
-        "id": "99e2e499-f997-4528-b1fc-2531470a057a",
-        "nodeId": "1",
-        "nodeDefinitionId": "_BDA56801-1155-4AF2-94D4-7DAADED2E3C0",
-        "nodeName": "Send visa application",
-        "nodeType": "ActionNode",
-        "triggerTime": "2022-03-18T15:33:05.588+10:00",
-        "leaveTime": "2022-03-18T15:33:05.595+10:00"
-      },
-      {
-        "id": "18f6b068-b7bf-4307-a3f9-be5606b726ca",
-        "nodeId": "6",
-        "nodeDefinitionId": "_24FBB8D6-EF2D-4DCC-846D-D8C5E21849D2",
-        "nodeName": "Apply for visa",
-        "nodeType": "HumanTaskNode",
-        "triggerTime": "2022-03-18T15:32:22.481+10:00",
-        "leaveTime": "2022-03-18T15:33:05.588+10:00"
-      }
-    ],
-    "variables": {
-      "trip": {
-        "city": "Brisbane",
-        "country": "Australia",
-        "begin": "2022-03-01T08:00:00.000+10:00",
-        "end": "2022-03-31T08:00:00.000+10:00",
-        "visaRequired": true
-      },
-      "visaApplication": {
-        "firstName": "Test",
-        "lastName": "Test",
-        "city": "Brisbane",
-        "country": "Australia",
-        "duration": 150,
-        "passportNumber": "CDDCDCDS",
-        "nationality": "Brazilian",
-        "approved": false
-      },
-      "traveller": {
-        "firstName": "Test",
-        "lastName": "Test",
-        "email": "test@email.com",
-        "nationality": "Brazilian",
-        "address": {
-          "street": "",
-          "city": "",
-          "zipCode": "",
-          "country": "Brazil"
-        }
-      }
-    },
-    "error": null,
-    "roles": null,
-    "milestones": []
+    "businessKey": "F7RTPS"
   },
   "specversion": "1.0",
   "kogitoprocinstanceid": "2308e23d-9998-47e9-a772-a078cf5b891b",
   "kogitoprocid": "travels",
   "kogitoaddons": "cloudevents,process-svg,prometheus-monitoring,monitoring,infinispan-persistence,process-management",
-  "kogitousertaskist": "1"
+  "kogitoprocist" : "1"
 }
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-common/src/test/resources/user_task_instance_event.json b/data-index/data-index-service/data-index-service-common/src/test/resources/user_task_instance_event.json
index 690d9b0073..8e461d20c3 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/resources/user_task_instance_event.json
+++ b/data-index/data-index-service/data-index-service-common/src/test/resources/user_task_instance_event.json
@@ -1,67 +1,24 @@
 {
   "id": "7680a3b6-2c5e-4d97-9964-5602341a1965",
   "source": "http://localhost:8080/travels",
-  "type": "UserTaskInstanceEvent",
+  "type": "UserTaskInstanceStateDataEvent",
   "time": "2022-03-18T15:33:05.608476+10:00",
   "data": {
-    "id": "45fae435-b098-4f27-97cf-a0c107072e8b",
-    "taskName": "VisaApplication",
-    "taskDescription": null,
-    "taskPriority": "1",
-    "referenceName": "Apply for visa",
-    "startDate": "2022-03-18T15:32:22.484+10:00",
-    "completeDate": "2022-03-18T15:33:05.586+10:00",
+    "eventDate": "2022-03-18T15:32:22.484+10:00",
+    "eventUser" : "my user",
+    "userTaskDefinitionId" : "123",
+    "userTaskInstanceId": "45fae435-b098-4f27-97cf-a0c107072e8b",
+   
+    "userTaskName": "VisaApplication",
+    "userTaskPriority": "1",
+    "userTaskDescription": null,
+
+    "userTaskReferenceName": "Apply for visa",
+
     "state": "Completed",
-    "actualOwner": null,
-    "potentialUsers": [],
-    "potentialGroups": [],
-    "excludedUsers": [],
-    "adminUsers": [],
-    "adminGroups": [],
-    "inputs": {
-      "trip": {
-        "city": "Brisbane",
-        "country": "Australia",
-        "begin": "2022-03-01T08:00:00.000+10:00",
-        "end": "2022-03-31T08:00:00.000+10:00",
-        "visaRequired": true
-      },
-      "NodeName": "Apply for visa",
-      "TaskName": "VisaApplication",
-      "Priority": "1",
-      "Skippable": "true",
-      "traveller": {
-        "firstName": "Test",
-        "lastName": "Test",
-        "email": "test@email.com",
-        "nationality": "Brazilian",
-        "address": {
-          "street": "",
-          "city": "",
-          "zipCode": "",
-          "country": "Brazil"
-        }
-      }
-    },
-    "outputs": {
-      "ActorId": null,
-      "visaApplication": {
-        "firstName": "Test",
-        "lastName": "Test",
-        "city": "Brisbane",
-        "country": "Australia",
-        "duration": 150,
-        "passportNumber": "CDDCDCDS",
-        "nationality": "Brazilian",
-        "approved": false
-      }
-    },
-    "comments": [],
-    "attachments": [],
-    "processInstanceId": "2308e23d-9998-47e9-a772-a078cf5b891b",
-    "rootProcessInstanceId": "",
-    "processId": "travels",
-    "rootProcessId": ""
+    "actualOwner": "henry",
+    "processInstanceId": "2308e23d-9998-47e9-a772-a078cf5b891b"
+
   },
   "specversion": "1.0",
   "kogitoprocinstanceid": "2308e23d-9998-47e9-a772-a078cf5b891b",
diff --git a/data-index/data-index-service/data-index-service-infinispan/pom.xml b/data-index/data-index-service/data-index-service-infinispan/pom.xml
index f57a46dc84..cc39b5b9ed 100644
--- a/data-index/data-index-service/data-index-service-infinispan/pom.xml
+++ b/data-index/data-index-service/data-index-service-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml
index 95d1dc5d5e..f66d29a002 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml
+++ b/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: '2.1'
 
 services:
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/main/resources/META-INF/hotrod-client.properties b/data-index/data-index-service/data-index-service-infinispan/src/main/resources/META-INF/hotrod-client.properties
index ed23c02c1a..03bfa85f8f 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/main/resources/META-INF/hotrod-client.properties
+++ b/data-index/data-index-service/data-index-service-infinispan/src/main/resources/META-INF/hotrod-client.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Docker 4 Mac workaround
 # infinispan.client.hotrod.client_intelligence=BASIC
 
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-infinispan/src/main/resources/application.properties
index 17020c9e8c..0023b411ce 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/main/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-infinispan/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.qute.property-not-found-strategy=default
 quarkus.qute.strict-rendering=false
 
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/main/resources/templates/kogito-cache-default.xml b/data-index/data-index-service/data-index-service-infinispan/src/main/resources/templates/kogito-cache-default.xml
index 3d69eb35d8..8fea9fc6db 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/main/resources/templates/kogito-cache-default.xml
+++ b/data-index/data-index-service/data-index-service-infinispan/src/main/resources/templates/kogito-cache-default.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <infinispan>
   <cache-container shutdown-hook="DEFAULT">
     {#let template=config:property('kogito.cache.domain.template')}
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml
index c75b517235..c1f396b628 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: "3"
 
 services:
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/infinispan/infinispan.xml b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/infinispan/infinispan.xml
index 4d594bfc24..a466561b9f 100755
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/infinispan/infinispan.xml
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/infinispan/infinispan.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <infinispan>
   <cache-container name="default"/>
   <server>
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java
index d055ca5ae2..72980a8fcf 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/KeycloakInfinispanIndexingServiceIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/KeycloakInfinispanIndexingServiceIT.java
index edfc540e27..d89bb70a0f 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/KeycloakInfinispanIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/KeycloakInfinispanIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.KeycloakTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanQueryIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanQueryIT.java
index c4bd349d89..bfb74fe4f3 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanQueryIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.cache;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanStorageIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanStorageIT.java
index b3dddec7dd..7525042cce 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanStorageIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/cache/InfinispanStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.cache;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/InfinispanWebSocketSubscriptionIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/InfinispanWebSocketSubscriptionIT.java
index 8f122a1111..846d525802 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/InfinispanWebSocketSubscriptionIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/InfinispanWebSocketSubscriptionIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLQueryOrderByIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLQueryOrderByIT.java
index 8792aa0f65..c9d9bca082 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLQueryOrderByIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLQueryOrderByIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql.query;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLRuntimesQueriesIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLRuntimesQueriesIT.java
index 97d83b2b90..35c57b0ae2 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLRuntimesQueriesIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/graphql/query/InfinispanGraphQLRuntimesQueriesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql.query;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingHttpConsumerIT.java
index 90a96a20e4..d359c61815 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingHttpConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingKafkaConsumerIT.java
index e3e86f4ae9..0ec9c88702 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanDomainMessagingKafkaConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.KafkaMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingHttpConsumerIT.java
index ad21a8d150..aa5ec069ac 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingHttpConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingKafkaConsumerIT.java
index cd85ef54ae..27d3117dc1 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingKafkaConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.KafkaMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingLoadKafkaIT.java
index 30525353bf..e88621d555 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingLoadKafkaIT.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/messaging/InfinispanMessagingLoadKafkaIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.junit.jupiter.api.Disabled;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
index c37ad70a6d..5bb82161ce 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
index 6e29df10fd..5d4bccd11a 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
index 5762f9ec42..552b6258b0 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/resources/application.properties b/data-index/data-index-service/data-index-service-infinispan/src/test/resources/application.properties
index 5308248c65..8f8a8ae113 100644
--- a/data-index/data-index-service/data-index-service-infinispan/src/test/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-infinispan/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Kogito
 kogito.apps.persistence.type=infinispan
 
@@ -31,4 +50,7 @@ quarkus.oidc.auth-server-url=none
 %keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
 
 kogito.data-index.vertx-graphql.ui.path=/graphiql
-kogito.data-index.vertx-graphql.ui.tenant=web-app-tenant
\ No newline at end of file
+kogito.data-index.vertx-graphql.ui.tenant=web-app-tenant
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-inmemory/pom.xml b/data-index/data-index-service/data-index-service-inmemory/pom.xml
index 6e6d19354b..87162031c3 100644
--- a/data-index/data-index-service/data-index-service-inmemory/pom.xml
+++ b/data-index/data-index-service/data-index-service-inmemory/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-service/data-index-service-inmemory/src/assembly/image-build-zip.xml b/data-index/data-index-service/data-index-service-inmemory/src/assembly/image-build-zip.xml
index a7d7d820d2..2592d48e8a 100644
--- a/data-index/data-index-service/data-index-service-inmemory/src/assembly/image-build-zip.xml
+++ b/data-index/data-index-service/data-index-service-inmemory/src/assembly/image-build-zip.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
diff --git a/data-index/data-index-service/data-index-service-inmemory/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-inmemory/src/main/resources/application.properties
index e24aa7d905..b6f9abadc6 100644
--- a/data-index/data-index-service/data-index-service-inmemory/src/main/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-inmemory/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=postgresql
 kogito.data-index.domain-indexing=false
diff --git a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/InmemoryPostgreSqlIndexingServiceIT.java b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/InmemoryPostgreSqlIndexingServiceIT.java
index 1997e08c91..b09e62783a 100644
--- a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/InmemoryPostgreSqlIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/InmemoryPostgreSqlIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/KeycloakInmemoryPostgreSqlIndexingServiceIT.java b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/KeycloakInmemoryPostgreSqlIndexingServiceIT.java
index 63a5f9411b..dc2367c60b 100644
--- a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/KeycloakInmemoryPostgreSqlIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/KeycloakInmemoryPostgreSqlIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.KeycloakTestProfile;
diff --git a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
index 46e10eb7d1..97807878af 100644
--- a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
index b52113e11c..4726c82e60 100644
--- a/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
+++ b/data-index/data-index-service/data-index-service-inmemory/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-inmemory/src/test/resources/application.properties b/data-index/data-index-service/data-index-service-inmemory/src/test/resources/application.properties
index 788c4e5c0a..052692f8a3 100644
--- a/data-index/data-index-service/data-index-service-inmemory/src/test/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-inmemory/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=postgresql
 kogito.data-index.domain-indexing=false
@@ -30,4 +49,7 @@ quarkus.oidc.auth-server-url=none
 #%keycloak-test.quarkus.oidc.web-app-tenant.auth-server-url=http://localhost:8281/auth/realms/kogito
 %keycloak-test.quarkus.oidc.web-app-tenant.client-id=kogito-app
 %keycloak-test.quarkus.oidc.web-app-tenant.credentials.secret=secret
-%keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
\ No newline at end of file
+%keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-mongodb/pom.xml b/data-index/data-index-service/data-index-service-mongodb/pom.xml
index d48156e46b..c7bbb627d8 100644
--- a/data-index/data-index-service/data-index-service-mongodb/pom.xml
+++ b/data-index/data-index-service/data-index-service-mongodb/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-mongodb/src/main/resources/application.properties
index 33fad8ba9c..59cd58cc24 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/main/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-mongodb/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Kogito
 kogito.apps.persistence.type=mongodb
 kogito.apps.persistence.indexing=false
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/KeycloakMongoIndexingServiceIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/KeycloakMongoIndexingServiceIT.java
index 0e5087cc5a..8c728460d7 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/KeycloakMongoIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/KeycloakMongoIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.KeycloakTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java
index f1f4a3baf0..d03507570f 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoQueryIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoQueryIT.java
index ac7fe3afc3..3b0a452977 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoQueryIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.cache;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoStorageIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoStorageIT.java
index b1c28dac39..8f7ea25b78 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoStorageIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/cache/MongoStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.cache;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/MongoWebSocketSubscriptionIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/MongoWebSocketSubscriptionIT.java
index 14806cf8a2..b51d97376e 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/MongoWebSocketSubscriptionIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/MongoWebSocketSubscriptionIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLQueryOrderByIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLQueryOrderByIT.java
index 7f0a9af85d..c9326efeee 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLQueryOrderByIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLQueryOrderByIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql.query;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLRuntimesQueriesIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLRuntimesQueriesIT.java
index d6efd5ef9a..5fcaac1687 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLRuntimesQueriesIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/graphql/query/MongoGraphQLRuntimesQueriesIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql.query;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingHttpConsumerIT.java
index ce4acd52e0..873fe4082c 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingHttpConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingKafkaConsumerIT.java
index 6b242dcbad..c3487ce439 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBDomainMessagingKafkaConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.KafkaMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingHttpConsumerIT.java
index 47019e6654..73d8aced4c 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingHttpConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingKafkaConsumerIT.java
index 6589612b6a..19e0ad196c 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoDBMessagingKafkaConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.KafkaMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoMessagingLoadKafkaIT.java
index 07a0febd17..5c7c42c38d 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoMessagingLoadKafkaIT.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/messaging/MongoMessagingLoadKafkaIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.junit.jupiter.api.Disabled;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
index 052f965e83..83a34c5b9d 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
index 2c6206f937..c897c0455f 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
index ebc49df926..40a69379bf 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/resources/application.properties b/data-index/data-index-service/data-index-service-mongodb/src/test/resources/application.properties
index 52e4270dd3..68347c230c 100644
--- a/data-index/data-index-service/data-index-service-mongodb/src/test/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-mongodb/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Kogito
 kogito.apps.persistence.type=mongodb
 
@@ -39,4 +58,7 @@ quarkus.oidc.auth-server-url=none
 %keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
 
 kogito.data-index.vertx-graphql.ui.path=/graphiql
-kogito.data-index.vertx-graphql.ui.tenant=web-app-tenant
\ No newline at end of file
+kogito.data-index.vertx-graphql.ui.tenant=web-app-tenant
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/data-index/data-index-service/data-index-service-oracle/pom.xml b/data-index/data-index-service/data-index-service-oracle/pom.xml
index 3d62a9f49d..cac61c7ba6 100644
--- a/data-index/data-index-service/data-index-service-oracle/pom.xml
+++ b/data-index/data-index-service/data-index-service-oracle/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-service/data-index-service-oracle/src/main/resources/META-INF/beans.xml b/data-index/data-index-service/data-index-service-oracle/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-service/data-index-service-oracle/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties
index bf3355c458..71c0215028 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-oracle/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=oracle
 kogito.data-index.domain-indexing=false
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml
index 0b1acbb00b..25578f35ed 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/docker/docker-compose.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: "3"
 
 networks:
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java
index c955cf2e36..d5b17e14b8 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/KeycloakOracleIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.KeycloakTestProfile;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java
index c04f38c2cd..436ba483ca 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/OracleIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java
index 84339e69ef..92148ad792 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/graphql/OracleDateTimeCoercingTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java
index 98c97e4a5a..1a255cf16d 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingHttpConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java
index dfe19193fe..ee54c4274a 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingKafkaConsumerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.messaging;
 
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java
index bbb9272b17..5163def5f7 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/messaging/OracleMessagingLoadKafkaIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.junit.jupiter.api.Disabled;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
index 531ca7d7eb..27bfc31fb6 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
index d6a4ba25a7..babcab6b20 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
index 83426d5471..f171568214 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties b/data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties
index 769e14f837..1e250e5239 100644
--- a/data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-oracle/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=oracle
 kogito.data-index.domain-indexing=false
@@ -39,3 +58,6 @@ quarkus.oidc.auth-server-url=none
 %keycloak-test.quarkus.oidc.web-app-tenant.client-id=kogito-app
 %keycloak-test.quarkus.oidc.web-app-tenant.credentials.secret=secret
 %keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
diff --git a/data-index/data-index-service/data-index-service-postgresql/pom.xml b/data-index/data-index-service/data-index-service-postgresql/pom.xml
index 8aaa2949fd..ed9461c1da 100644
--- a/data-index/data-index-service/data-index-service-postgresql/pom.xml
+++ b/data-index/data-index-service/data-index-service-postgresql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/META-INF/beans.xml b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties
index 32a1b68433..ac4d1958d9 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=postgresql
 kogito.data-index.domain-indexing=false
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-postgresql/src/test/docker/docker-compose.yml
index 018af6ed10..189052eee9 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/docker/docker-compose.yml
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/docker/docker-compose.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: "3"
 
 services:
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/KeycloakPostgreSqlIndexingServiceIT.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/KeycloakPostgreSqlIndexingServiceIT.java
index c11ef47b2b..c84e1c30d6 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/KeycloakPostgreSqlIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/KeycloakPostgreSqlIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.KeycloakTestProfile;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/PostgreSqlIndexingServiceIT.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/PostgreSqlIndexingServiceIT.java
index b2ae9625b2..b082e48a76 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/PostgreSqlIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/PostgreSqlIndexingServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java
index 2f36d96316..9ac63e7352 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/graphql/PostgreSqlDateTimeCoercingTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.graphql;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingHttpConsumerIT.java
index 1f78d715d3..f19e310a39 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingHttpConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingKafkaConsumerIT.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingKafkaConsumerIT.java
index 4c19595f9b..ce78568bc5 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingKafkaConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingKafkaConsumerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.service.messaging;
 
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingLoadKafkaIT.java
index bbb9272b17..5163def5f7 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingLoadKafkaIT.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/messaging/PostgreSqlMessagingLoadKafkaIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.messaging;
 
 import org.junit.jupiter.api.Disabled;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
index 4625aebae3..890fe3eb08 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/InMemoryMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
index e1a29622cc..320a6b2252 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KafkaMessageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
index 7e08b40661..cd1f783ebb 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/java/org/kie/kogito/index/service/test/KeycloakTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.service.test;
 
 import java.util.Arrays;
diff --git a/data-index/data-index-service/data-index-service-postgresql/src/test/resources/application.properties b/data-index/data-index-service/data-index-service-postgresql/src/test/resources/application.properties
index 999595bf1c..9c9f91f716 100644
--- a/data-index/data-index-service/data-index-service-postgresql/src/test/resources/application.properties
+++ b/data-index/data-index-service/data-index-service-postgresql/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=postgresql
 kogito.data-index.domain-indexing=false
@@ -37,4 +56,7 @@ quarkus.oidc.auth-server-url=none
 #%keycloak-test.quarkus.oidc.web-app-tenant.auth-server-url=http://localhost:8281/auth/realms/kogito
 %keycloak-test.quarkus.oidc.web-app-tenant.client-id=kogito-app
 %keycloak-test.quarkus.oidc.web-app-tenant.credentials.secret=secret
-%keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
\ No newline at end of file
+%keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/data-index/data-index-service/pom.xml b/data-index/data-index-service/pom.xml
index 25d9f45af3..34eb698307 100644
--- a/data-index/data-index-service/pom.xml
+++ b/data-index/data-index-service/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/data-index-storage/data-index-storage-api/pom.xml b/data-index/data-index-storage/data-index-storage-api/pom.xml
index 87324bd0d8..36dd84231d 100644
--- a/data-index/data-index-storage/data-index-storage-api/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-api/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Attachment.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Attachment.java
index 182de3404d..fdaf293ac2 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Attachment.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Attachment.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Comment.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Comment.java
index e3065c03f1..bf1b688a0f 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Comment.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Comment.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Job.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Job.java
index e2e0299dff..2a4bfbdccc 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Job.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Job.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/KogitoMetadata.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/KogitoMetadata.java
index 1e158913f0..989a4cb5fe 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/KogitoMetadata.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/KogitoMetadata.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Milestone.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Milestone.java
index bb9c5119a0..4383eeb72a 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Milestone.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Milestone.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.model;
 
 public class Milestone {
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/MilestoneStatus.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/MilestoneStatus.java
index 6d002dd602..8ffed4bd59 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/MilestoneStatus.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/MilestoneStatus.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.model;
 
 public enum MilestoneStatus {
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Node.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Node.java
index f349f3de9c..84939239e9 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Node.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/Node.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/NodeInstance.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/NodeInstance.java
index 00b9ed4a2e..1e22527c59 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/NodeInstance.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/NodeInstance.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessDefinition.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessDefinition.java
index 623c723ce3..200d4347f8 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessDefinition.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessDefinition.java
@@ -1,23 +1,29 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 public class ProcessDefinition {
 
@@ -29,7 +35,9 @@ public class ProcessDefinition {
     private Set<String> addons;
     private String endpoint;
     private String source;
-
+    private String description;
+    private Set<String> annotations;
+    private Map<String, String> metadata;
     private List<Node> nodes;
 
     public String getId() {
@@ -109,7 +117,35 @@ public String getKey() {
     }
 
     public static String toKey(String processId, String version) {
-        return String.format("%s-%s", processId, version);
+        return processId + "$v:" + version;
+    }
+
+    public static String[] fromKey(String key) {
+        return Optional.ofNullable(key).map(k -> k.split(Pattern.quote("$v:"))).orElse(new String[0]);
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Set<String> getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Set<String> annotations) {
+        this.annotations = annotations;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
     }
 
     @Override
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstance.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstance.java
index a70e7335af..82618f0ed3 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstance.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstance.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
@@ -82,13 +85,8 @@ public void setDefinition(ProcessDefinition definition) {
 
     @Override
     public String toString() {
-        return "ProcessInstance{" +
-                "variables=" + variables +
-                ", nodes=" + nodes +
-                ", milestones=" + milestones +
-                ", definition=" + definition +
-                ", addons=" + addons +
-                ", error=" + error +
-                "} " + super.toString();
+        return super.toString() + " -> ProcessInstance [variables=" + variables + ", nodes=" + nodes + ", milestones=" + milestones + ", addons=" + addons + ", error=" + error + ", definition="
+                + definition + "]";
     }
+
 }
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceError.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceError.java
index 24bb9b9829..0023df32ed 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceError.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceError.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceMeta.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceMeta.java
index 9a1172a196..d211ea198d 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceMeta.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceMeta.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceState.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceState.java
index e7ca653cbd..86c33487be 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceState.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/ProcessInstanceState.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java
index 5bf92e8305..8572edcaf8 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstanceMeta.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstanceMeta.java
index 3863a4ea9a..ec95b5858d 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstanceMeta.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstanceMeta.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.model;
 
@@ -103,9 +106,7 @@ public String getActualOwner() {
     }
 
     public void setActualOwner(String actualOwner) {
-        if (actualOwner != null && !actualOwner.trim().isEmpty()) {
-            this.actualOwner = actualOwner;
-        }
+        this.actualOwner = actualOwner;
     }
 
     public Set<String> getAdminGroups() {
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/Constants.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/Constants.java
index 9c6bd7340e..599b63cdb4 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/Constants.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/Constants.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.storage;
 
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageService.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageService.java
index 2bc18a3db3..6c7a3dc320 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageService.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.storage;
 
 import org.kie.kogito.index.model.Job;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
index c661a01e79..58f04a1bee 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-api/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestBase.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestBase.java
index b0e7c789fd..a24e56b616 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestBase.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestBase.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test;
 
 import java.time.Instant;
@@ -22,7 +24,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import org.junit.jupiter.api.AfterEach;
 import org.kie.kogito.persistence.api.Storage;
 import org.kie.kogito.persistence.api.query.AttributeFilter;
 import org.kie.kogito.persistence.api.query.AttributeSort;
@@ -35,11 +36,6 @@ protected Boolean isDateTimeAsLong() {
         return true;
     }
 
-    @AfterEach
-    void tearDown() {
-        getStorage().clear();
-    }
-
     public void queryAndAssert(BiConsumer<List<V>, String[]> assertConsumer, Storage<K, V> storage, List<AttributeFilter<?>> filters, List<AttributeSort> sort, Integer offset, Integer limit,
             String... ids) {
         assertConsumer.accept(storage.query().filter(filters).sort(sort).offset(offset).limit(limit).execute(), ids);
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestUtils.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestUtils.java
index feb6f903ba..6477143d26 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestUtils.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/QueryTestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test;
 
 import java.util.List;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/TestUtils.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/TestUtils.java
index 27ac6990b8..c3af9b66b3 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/TestUtils.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/TestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test;
 
 import java.time.Instant;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractJobQueryIT.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractJobQueryIT.java
index f01d73edf8..12db5fda45 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractJobQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractJobQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.query;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessDefinitionQueryIT.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessDefinitionQueryIT.java
index d7d9fa55fa..cfa142cc07 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessDefinitionQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessDefinitionQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.query;
 
 import java.util.List;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessIdQueryIT.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessIdQueryIT.java
index 532b0627c9..dd8b57d50d 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessIdQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessIdQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.query;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessInstanceQueryIT.java
index 35f37cf72c..a3cde4fc1c 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractProcessInstanceQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.query;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractUserTaskInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractUserTaskInstanceQueryIT.java
index 7f17cd9e01..7623257410 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractUserTaskInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/test/java/org/kie/kogito/index/test/query/AbstractUserTaskInstanceQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.query;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/pom.xml b/data-index/data-index-storage/data-index-storage-infinispan/pom.xml
index d0363f03e4..56dc3283a1 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
index c190c73533..b977cc090e 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshaller.java
index b6f8d55e8d..22781db7c0 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/CommentMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/CommentMarshaller.java
index f1fb353d00..51788b5366 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/CommentMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/CommentMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/EntryMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/EntryMarshaller.java
new file mode 100644
index 0000000000..504d14aa25
--- /dev/null
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/EntryMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index.infinispan.protostream;
+
+import java.io.IOException;
+
+import org.infinispan.protostream.MessageMarshaller;
+import org.kie.kogito.index.model.Entry;
+import org.kie.kogito.persistence.infinispan.protostream.AbstractMarshaller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EntryMarshaller extends AbstractMarshaller implements MessageMarshaller<Entry> {
+
+    private static final String KEY = "key";
+    private static final String VALUE = "value";
+
+    public EntryMarshaller(ObjectMapper mapper) {
+        super(mapper);
+    }
+
+    @Override
+    public Entry readFrom(ProtoStreamReader reader) throws IOException {
+        return new Entry(reader.readString(KEY), reader.readString(VALUE));
+    }
+
+    @Override
+    public void writeTo(ProtoStreamWriter writer, Entry entry) throws IOException {
+        writer.writeString(KEY, entry.getKey());
+        writer.writeString(VALUE, entry.getValue());
+    }
+
+    @Override
+    public Class<? extends Entry> getJavaClass() {
+        return Entry.class;
+    }
+
+    @Override
+    public String getTypeName() {
+        return getJavaClass().getName();
+    }
+}
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/JobMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/JobMarshaller.java
index b4f5aa4aa5..4bc89c8b24 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/JobMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/JobMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshaller.java
index c1d9771d71..0d12bdf59b 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshaller.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeInstanceMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeInstanceMarshaller.java
index c4be22fc37..194ad08caa 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeInstanceMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeInstanceMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMarshaller.java
index e4d28b89c6..2b7b998c5a 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMetadataMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMetadataMarshaller.java
index 97146a3e33..7d7e490c3d 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMetadataMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/NodeMetadataMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshaller.java
index 1a01a0c6fa..720fdf1e02 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshaller.java
@@ -1,25 +1,33 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.infinispan.protostream.MessageMarshaller;
+import org.kie.kogito.index.model.Entry;
 import org.kie.kogito.index.model.Node;
 import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.persistence.infinispan.protostream.AbstractMarshaller;
@@ -31,11 +39,13 @@ public class ProcessDefinitionMarshaller extends AbstractMarshaller implements M
     protected static final String ID = "id";
     protected static final String VERSION = "version";
     protected static final String NAME = "name";
+    protected static final String ANNOTATIONS = "annotations";
+    protected static final String DESCRIPTION = "description";
+    protected static final String METADATA = "metadata";
     protected static final String ROLES = "roles";
     protected static final String ADDONS = "addons";
     protected static final String TYPE = "type";
     protected static final String ENDPOINT = "endpoint";
-
     protected static final String SOURCE = "source";
     protected static final String NODES = "nodes";
 
@@ -49,6 +59,9 @@ public ProcessDefinition readFrom(ProtoStreamReader reader) throws IOException {
         pd.setId(reader.readString(ID));
         pd.setVersion(reader.readString(VERSION));
         pd.setName(reader.readString(NAME));
+        pd.setDescription(reader.readString(DESCRIPTION));
+        pd.setAnnotations(reader.readCollection(ANNOTATIONS, new HashSet<>(), String.class));
+        pd.setMetadata(buildMetadata(reader));
         pd.setRoles(reader.readCollection(ROLES, new HashSet<>(), String.class));
         pd.setAddons(reader.readCollection(ADDONS, new HashSet<>(), String.class));
         pd.setType(reader.readString(TYPE));
@@ -59,11 +72,20 @@ public ProcessDefinition readFrom(ProtoStreamReader reader) throws IOException {
         return pd;
     }
 
+    private static Map<String, String> buildMetadata(ProtoStreamReader reader) throws IOException {
+        return Optional.ofNullable(reader.readCollection(METADATA, new HashSet<>(), Entry.class))
+                .map(entries -> entries.stream().collect(Collectors.toMap(Entry::getKey, Entry::getValue)))
+                .orElse(null);
+    }
+
     @Override
     public void writeTo(ProtoStreamWriter writer, ProcessDefinition pd) throws IOException {
         writer.writeString(ID, pd.getId());
         writer.writeString(VERSION, pd.getVersion());
         writer.writeString(NAME, pd.getName());
+        writer.writeString(DESCRIPTION, pd.getDescription());
+        writer.writeCollection(ANNOTATIONS, pd.getAnnotations(), String.class);
+        writer.writeCollection(METADATA, buildMetadata(pd), Entry.class);
         writer.writeCollection(ROLES, pd.getRoles(), String.class);
         writer.writeCollection(ADDONS, pd.getAddons(), String.class);
         writer.writeString(TYPE, pd.getType());
@@ -72,6 +94,13 @@ public void writeTo(ProtoStreamWriter writer, ProcessDefinition pd) throws IOExc
         writer.writeCollection(NODES, pd.getNodes(), Node.class);
     }
 
+    private static Set<Entry> buildMetadata(ProcessDefinition pd) {
+        return Optional.ofNullable(pd.getMetadata())
+                .map(Map::entrySet)
+                .map(entries -> entries.stream().map(e -> new Entry(e.getKey(), e.getValue())).collect(Collectors.toSet()))
+                .orElse(null);
+    }
+
     @Override
     public Class<? extends ProcessDefinition> getJavaClass() {
         return ProcessDefinition.class;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceErrorMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceErrorMarshaller.java
index c1f3300398..e0df969a7b 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceErrorMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceErrorMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshaller.java
index 01f3cabed4..ab391703aa 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
index 61d309809a..09d4ba9808 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
@@ -49,6 +52,11 @@ MessageMarshaller nodeMarshaller() {
         return new NodeMarshaller(mapper);
     }
 
+    @Produces
+    MessageMarshaller entryMarshaller() {
+        return new EntryMarshaller(mapper);
+    }
+
     @Produces
     MessageMarshaller nodeMetadataMarshaller() {
         return new NodeMetadataMarshaller(mapper);
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshaller.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshaller.java
index 70248be82d..b3ba2e74f3 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshaller.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
index 5b3f5b2876..030bcd3085 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.schema;
 
 import java.util.Optional;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
index 24b7f2ebc1..e468429a7d 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.schema;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/model/Entry.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/model/Entry.java
new file mode 100644
index 0000000000..c13c40daac
--- /dev/null
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/model/Entry.java
@@ -0,0 +1,59 @@
+package org.kie.kogito.index.model;
+
+import java.util.Objects;
+
+public class Entry {
+
+    private String key;
+
+    private String value;
+
+    public Entry() {
+    }
+
+    public Entry(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Entry)) {
+            return false;
+        }
+        Entry entry = (Entry) o;
+        return Objects.equals(key, entry.key) && Objects.equals(value, entry.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(key, value);
+    }
+
+    @Override
+    public String toString() {
+        return "Entry{" +
+                "key='" + key + '\'' +
+                ", value='" + value + '\'' +
+                '}';
+    }
+}
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/model/NodeMetadata.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/model/NodeMetadata.java
index 60b0b5d8ba..d4ced0c73c 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/model/NodeMetadata.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/model/NodeMetadata.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.model;
 
 public class NodeMetadata {
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-infinispan/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshallerTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshallerTest.java
index ad20ba9193..a4292660cd 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshallerTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/AttachmentMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/CommentMarshallerTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/CommentMarshallerTest.java
index a51d1ae266..78e96c758c 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/CommentMarshallerTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/CommentMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshallerTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshallerTest.java
index 0e5f8ac04a..e1e1e9bf89 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshallerTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/MilestoneMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshallerTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshallerTest.java
index 0bdb6be50f..e8f08da5fb 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshallerTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessDefinitionMarshallerTest.java
@@ -1,33 +1,41 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
 import java.util.HashSet;
+import java.util.Map;
 
 import org.infinispan.protostream.MessageMarshaller;
 import org.junit.jupiter.api.Test;
+import org.kie.kogito.index.model.Entry;
 import org.kie.kogito.index.model.ProcessDefinition;
 import org.mockito.InOrder;
 
 import static java.util.Collections.singleton;
+import static java.util.stream.Collectors.toSet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.ADDONS;
+import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.ANNOTATIONS;
+import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.DESCRIPTION;
 import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.ID;
+import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.METADATA;
 import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.NAME;
 import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.ROLES;
 import static org.kie.kogito.index.infinispan.protostream.ProcessDefinitionMarshaller.TYPE;
@@ -46,6 +54,9 @@ void testReadFrom() throws IOException {
         when(reader.readString(ID)).thenReturn("processId");
         when(reader.readString(VERSION)).thenReturn("1.0");
         when(reader.readString(NAME)).thenReturn("processName");
+        when(reader.readString(DESCRIPTION)).thenReturn("descr");
+        when(reader.readCollection(eq(ANNOTATIONS), any(), eq(String.class))).thenReturn(new HashSet<>(singleton("tag1")));
+        when(reader.readCollection(eq(METADATA), any(), eq(Entry.class))).thenReturn(new HashSet<>(singleton(new Entry("key1", "value1"))));
         when(reader.readCollection(eq(ROLES), any(), eq(String.class))).thenReturn(new HashSet<>(singleton("admin")));
         when(reader.readCollection(eq(ADDONS), any(), eq(String.class))).thenReturn(new HashSet<>(singleton("process-management")));
         when(reader.readString(TYPE)).thenReturn("processType");
@@ -58,6 +69,9 @@ void testReadFrom() throws IOException {
                 .hasFieldOrPropertyWithValue(ID, "processId")
                 .hasFieldOrPropertyWithValue(VERSION, "1.0")
                 .hasFieldOrPropertyWithValue(NAME, "processName")
+                .hasFieldOrPropertyWithValue(DESCRIPTION, "descr")
+                .hasFieldOrPropertyWithValue(ANNOTATIONS, singleton("tag1"))
+                .hasFieldOrPropertyWithValue(METADATA, Map.of("key1", "value1"))
                 .hasFieldOrPropertyWithValue(ROLES, singleton("admin"))
                 .hasFieldOrPropertyWithValue(ADDONS, singleton("process-management"))
                 .hasFieldOrPropertyWithValue(TYPE, "processType");
@@ -66,6 +80,9 @@ void testReadFrom() throws IOException {
         inOrder.verify(reader).readString(ID);
         inOrder.verify(reader).readString(VERSION);
         inOrder.verify(reader).readString(NAME);
+        inOrder.verify(reader).readString(DESCRIPTION);
+        inOrder.verify(reader).readCollection(ANNOTATIONS, new HashSet<>(), String.class);
+        inOrder.verify(reader).readCollection(METADATA, new HashSet<>(), Entry.class);
         inOrder.verify(reader).readCollection(ROLES, new HashSet<>(), String.class);
         inOrder.verify(reader).readCollection(ADDONS, new HashSet<>(), String.class);
         inOrder.verify(reader).readString(TYPE);
@@ -77,6 +94,9 @@ void testWriteTo() throws IOException {
         pd.setId("processId");
         pd.setVersion("1.0");
         pd.setName("processName");
+        pd.setDescription("descr");
+        pd.setAnnotations(singleton("tag1"));
+        pd.setMetadata(Map.of("key1", "value1"));
         pd.setRoles(singleton("admin"));
         pd.setAddons(singleton("process-management"));
         pd.setType("processType");
@@ -90,6 +110,9 @@ void testWriteTo() throws IOException {
         inOrder.verify(writer).writeString(ID, pd.getId());
         inOrder.verify(writer).writeString(VERSION, pd.getVersion());
         inOrder.verify(writer).writeString(NAME, pd.getName());
+        inOrder.verify(writer).writeString(DESCRIPTION, pd.getDescription());
+        inOrder.verify(writer).writeCollection(ANNOTATIONS, pd.getAnnotations(), String.class);
+        inOrder.verify(writer).writeCollection(METADATA, pd.getMetadata().entrySet().stream().map(e -> new Entry(e.getKey(), e.getValue())).collect(toSet()), Entry.class);
         inOrder.verify(writer).writeCollection(ROLES, pd.getRoles(), String.class);
         inOrder.verify(writer).writeCollection(ADDONS, pd.getAddons(), String.class);
         inOrder.verify(writer).writeString(TYPE, pd.getType());
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshallerTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshallerTest.java
index 8198a00de0..8f36a2d48e 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshallerTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProcessInstanceMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaAcceptorTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaAcceptorTest.java
index 3c8fc0b7b2..7a66bdf402 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaAcceptorTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaAcceptorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.util.Optional;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaManagerTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaManagerTest.java
index 9eb2319b7f..cb3b174a93 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaManagerTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/ProtoSchemaManagerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/TestUtils.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/TestUtils.java
index 08243794fc..b22291ec7d 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/TestUtils.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/TestUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.infinispan.protostream;
 
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshallerTest.java b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshallerTest.java
index 861242dbd3..6c19ae9b54 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshallerTest.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/test/java/org/kie/kogito/index/infinispan/protostream/UserTaskInstanceMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.infinispan.protostream;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/pom.xml b/data-index/data-index-storage/data-index-storage-mongodb/pom.xml
index ff9af4d82c..e0198e02a0 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-mongodb/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/Constants.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/Constants.java
index a076d69fc7..de3ba2c602 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/Constants.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb;
 
 public class Constants {
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/DomainEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/DomainEntityMapper.java
index e49ecf0592..b8ed1d4b0a 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/DomainEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/DomainEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import org.bson.Document;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntity.java
index e140e5f3dd..5e8794bdc3 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntity.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.Objects;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntityMapper.java
index 734439748b..7085a0b1a3 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/JobEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import org.kie.kogito.index.model.Job;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntity.java
index 941ef0db29..b009835ade 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntity.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.List;
@@ -32,8 +34,14 @@ public class ProcessDefinitionEntity {
 
     private String version;
     private String name;
+
+    private String description;
     private String type;
 
+    private Set<String> annotations;
+
+    private Map<String, String> metadata;
+
     private Set<String> roles;
 
     private Set<String> addons;
@@ -124,6 +132,30 @@ public void setNodes(List<NodeEntity> nodes) {
         this.nodes = nodes;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Set<String> getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Set<String> annotations) {
+        this.annotations = annotations;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapper.java
index 94a8016963..6dfc5573db 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.function.Function;
@@ -42,6 +44,9 @@ public ProcessDefinitionEntity mapToEntity(String key, ProcessDefinition pd) {
         entity.setId(pd.getId());
         entity.setVersion(pd.getVersion());
         entity.setName(pd.getName());
+        entity.setDescription(pd.getDescription());
+        entity.setAnnotations(pd.getAnnotations());
+        entity.setMetadata(pd.getMetadata());
         entity.setRoles(pd.getRoles());
         entity.setAddons(pd.getAddons());
         entity.setType(pd.getType());
@@ -61,6 +66,9 @@ public ProcessDefinition mapToModel(ProcessDefinitionEntity entity) {
         pd.setId(entity.getId());
         pd.setVersion(entity.getVersion());
         pd.setName(entity.getName());
+        pd.setDescription(entity.getDescription());
+        pd.setAnnotations(entity.getAnnotations());
+        pd.setMetadata(entity.getMetadata());
         pd.setRoles(entity.getRoles());
         pd.setAddons(entity.getAddons());
         pd.setType(entity.getType());
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntity.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntity.java
index f99d923c8c..cea6d58880 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntity.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.Objects;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapper.java
index 96417d01fa..dc6b27e8ae 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import org.kie.kogito.persistence.mongodb.model.MongoEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntity.java
index b2d2b53ad0..28cef62442 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.List;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapper.java
index 141871f46d..16e1f13d3c 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.Optional;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java
index 48b4e96d4f..a027ad3843 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.List;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
index 153f044181..b7479af604 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.Optional;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
index aab322ab85..aae8a0de98 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import java.util.Map;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
index 22a3c50201..821db8cb62 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-mongodb/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/ConstantsTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/ConstantsTest.java
index 176d679b4e..aa2f72a3fb 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/ConstantsTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/ConstantsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
index 3e5ebfe7ea..58b44ecdb0 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.mock;
 
 import java.util.List;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/DomainEntityMapperTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/DomainEntityMapperTest.java
index 6a6fca117a..2811951998 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/DomainEntityMapperTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/DomainEntityMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/JobEntityMapperTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/JobEntityMapperTest.java
index 9600264c2f..79bb8094a8 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/JobEntityMapperTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/JobEntityMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapperTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapperTest.java
index 999bf6ac0e..e663f6936d 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapperTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessDefinitionEntityMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.util.Set;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapperTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapperTest.java
index dde7c8361d..430de52f3f 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapperTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessIdEntityMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapperTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapperTest.java
index 9a24a2ed4f..a36ead9e50 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapperTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/ProcessInstanceEntityMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java
index 2eeb1f1fe4..9340704383 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
index 15f97f852a..d7b27ffb10 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.query;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
index 0b339b3b78..5dce2a361a 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
index 739e57746f..db78b84704 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
index 41195a849e..1c3330bb16 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
index 59bbfc5131..e6db6b9af3 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
index acbdb205cf..e7149a0afc 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
index e836b63f36..c31ddfc9a8 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
index 2d621acd78..088d6ccfa9 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
index b0f15736b6..7744351fb1 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
index bdd558f29c..2c669e5c87 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
@@ -1,25 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import java.util.Set;
 
 import javax.inject.Inject;
 
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -59,7 +62,7 @@ void tearDown() {
 
     @Test
     void testCache() {
-        String processId = "travels";
+        String processId = RandomStringUtils.randomAlphabetic(10);
         String version = "1.0";
         ProcessDefinition pdv1 = TestUtils.createProcessDefinition(processId, version, Set.of("admin", "kogito"));
         ProcessDefinition pdv2 = TestUtils.createProcessDefinition(processId, version, Set.of("kogito"));
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
index 591a5fa507..d19db523ef 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import javax.inject.Inject;
 
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -55,7 +58,7 @@ void tearDown() {
 
     @Test
     void testCache() {
-        String processId = "travels";
+        String processId = RandomStringUtils.randomAlphabetic(10);
         String type1 = "org.acme.travels.travels";
         String type2 = "org.acme.travels";
         testStorage(storage, processId, type1, type2);
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
index 3c91dc4711..0297346530 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
index 41e635b0db..04bd7bb6c4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/StorageTestBase.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/StorageTestBase.java
index 5641e0ba61..adbeaa03a4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/StorageTestBase.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/StorageTestBase.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import org.kie.kogito.persistence.api.Storage;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
index b6b19973fa..3f3b95df05 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.mongodb.storage;
 
 import java.util.UUID;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/resources/application.properties b/data-index/data-index-storage/data-index-storage-mongodb/src/test/resources/application.properties
index 1ac6ecfb9f..ebc31394c1 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/resources/application.properties
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Quarkus
 quarkus.log.console.enable=true
 quarkus.log.console.level=INFO
diff --git a/data-index/data-index-storage/data-index-storage-oracle/pom.xml b/data-index/data-index-storage/data-index-storage-oracle/pom.xml
index a7156a678f..30e2c30b4c 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-oracle/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/JobEntityMapper.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/JobEntityMapper.java
index 8bbc88baa1..7197b6b67c 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/JobEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/JobEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import org.kie.kogito.index.model.Job;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapper.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapper.java
index 70b13ea457..b1cb60f0cb 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapper.java
index 3e8bbfbb78..06d89a3050 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import org.kie.kogito.index.model.Milestone;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapper.java
index cabbe7a1c2..11bd8f3993 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import org.kie.kogito.index.model.UserTaskInstance;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AbstractEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AbstractEntity.java
index 8573609932..3dbf23656e 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AbstractEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AbstractEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.io.Serializable;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
index 790b2d9449..81e8fb2f2d 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.ForeignKey;
 import javax.persistence.Id;
@@ -27,9 +28,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
 @Entity(name = "attachments")
 @Table(name = "attachments")
 public class AttachmentEntity extends AbstractEntity {
@@ -40,8 +38,7 @@ public class AttachmentEntity extends AbstractEntity {
     private String content;
     private String updatedBy;
     private ZonedDateTime updatedAt;
-    @ManyToOne(cascade = CascadeType.ALL, optional = false)
-    @OnDelete(action = OnDeleteAction.CASCADE)
+    @ManyToOne(optional = false)
     @JoinColumn(name = "taskId", foreignKey = @ForeignKey(name = "fk_attachments_tasks"))
     private UserTaskInstanceEntity userTask;
 
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
index 7b391f0e93..03e06e35b9 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.ForeignKey;
 import javax.persistence.Id;
@@ -27,9 +28,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
 @Entity(name = "comments")
 @Table(name = "comments")
 public class CommentEntity extends AbstractEntity {
@@ -39,8 +37,7 @@ public class CommentEntity extends AbstractEntity {
     private String content;
     private String updatedBy;
     private ZonedDateTime updatedAt;
-    @ManyToOne(cascade = CascadeType.ALL, optional = false)
-    @OnDelete(action = OnDeleteAction.CASCADE)
+    @ManyToOne(optional = false)
     @JoinColumn(name = "taskId", foreignKey = @ForeignKey(name = "fk_comments_tasks"))
     private UserTaskInstanceEntity userTask;
 
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
index a2071050fd..7082fa32e5 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
index 65efa3b56e..f2ae36f771 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
index f44999a41e..b943daa6e8 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.util.Objects;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntityId.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntityId.java
index becb5d9a31..f073c1b6e7 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntityId.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntityId.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.io.Serializable;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
index 8db9a852bb..a1807c850c 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.util.Map;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntityId.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntityId.java
index 8416acda4d..88993274e5 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntityId.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntityId.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.io.Serializable;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
index 2759fea985..57650f4e8e 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
index 411986e117..9e7703b505 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
@@ -1,22 +1,25 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
@@ -29,6 +32,7 @@
 import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.JoinColumn;
+import javax.persistence.MapKeyColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
@@ -46,6 +50,7 @@ public class ProcessDefinitionEntity extends AbstractEntity {
     @Id
     private String version;
     private String name;
+    private String description;
     private String type;
     private byte[] source;
 
@@ -65,6 +70,23 @@ public class ProcessDefinitionEntity extends AbstractEntity {
     @Column(name = "addon", nullable = false)
     private Set<String> addons;
 
+    @ElementCollection
+    @JoinColumn(name = "id")
+    @CollectionTable(name = "definitions_annotations", joinColumns = { @JoinColumn(name = "process_id", referencedColumnName = "id"),
+            @JoinColumn(name = "process_version", referencedColumnName = "version") }, foreignKey = @ForeignKey(name = "fk_definitions_annotations"))
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @Column(name = "value")
+    private Set<String> annotations;
+    @ElementCollection
+    @JoinColumn(name = "id")
+    @CollectionTable(name = "definitions_metadata", joinColumns = {
+            @JoinColumn(name = "process_id", referencedColumnName = "id"), @JoinColumn(name = "process_version", referencedColumnName = "version") },
+            foreignKey = @ForeignKey(name = "fk_definitions_metadata"))
+    @MapKeyColumn(name = "key")
+    @Column(name = "value")
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    private Map<String, String> metadata;
+
     private String endpoint;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "processDefinition")
@@ -143,6 +165,30 @@ public void setNodes(List<NodeEntity> nodes) {
         this.nodes = nodes;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Set<String> getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Set<String> annotations) {
+        this.annotations = annotations;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityId.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityId.java
index d8150f3a49..6e2e6575cf 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityId.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityId.java
@@ -1,24 +1,29 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.io.Serializable;
 import java.util.Objects;
 
+import static org.kie.kogito.index.model.ProcessDefinition.fromKey;
+import static org.kie.kogito.index.model.ProcessDefinition.toKey;
+
 public class ProcessDefinitionEntityId implements Serializable {
 
     private String id;
@@ -29,9 +34,9 @@ public ProcessDefinitionEntityId() {
     }
 
     public ProcessDefinitionEntityId(String key) {
-        String[] split = key.split("-");
-        this.id = split[0];
-        this.version = split[1];
+        String[] fromKey = fromKey(key);
+        this.id = fromKey[0];
+        this.version = fromKey[1];
     }
 
     public ProcessDefinitionEntityId(String id, String version) {
@@ -40,7 +45,7 @@ public ProcessDefinitionEntityId(String id, String version) {
     }
 
     public String getKey() {
-        return String.format("%s-%s", id, version);
+        return toKey(id, version);
     }
 
     public String getId() {
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
index 88be8193c3..f301ca0a0f 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
index f57178d54b..65dbfd9f43 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
index c4873a558a..5e50438b7e 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
index 6249bb545d..894847308c 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.util.Objects;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
index b14d71cff1..cad8138f3f 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import java.time.ZonedDateTime;
@@ -26,6 +28,7 @@
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.ForeignKey;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
@@ -95,9 +98,9 @@ public class UserTaskInstanceEntity extends AbstractEntity {
     @Type(type = "jsonb")
     private ObjectNode outputs;
     private String endpoint;
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask")
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask", orphanRemoval = true, fetch = FetchType.LAZY)
     private List<CommentEntity> comments;
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask")
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask", orphanRemoval = true, fetch = FetchType.LAZY)
     private List<AttachmentEntity> attachments;
 
     @Override
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
index ed0c35dda7..9a2659f67e 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
index d365088eb6..d319ee18c1 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
@@ -1,24 +1,29 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
+import java.util.ConcurrentModificationException;
 import java.util.Map;
 import java.util.function.Function;
 
+import javax.persistence.LockModeType;
+import javax.persistence.PersistenceException;
 import javax.transaction.Transactional;
 
 import org.kie.kogito.index.oracle.model.AbstractEntity;
@@ -84,8 +89,19 @@ public V get(String key) {
     @Override
     @Transactional
     public V put(String key, V value) {
-        repository.deleteById(key);
-        repository.persist(mapToEntity.apply(value));
+        //Pessimistic lock is used to lock the row to handle concurrency with an exiting registry
+        E persistedEntity = repository.findById(key, LockModeType.PESSIMISTIC_WRITE);
+        E newEntity = mapToEntity.apply(value);
+        if (persistedEntity != null) {
+            repository.getEntityManager().merge(newEntity);
+        } else {
+            try {
+                //to handle concurrency in case of a new registry persist flush and throw an exception to allow retry on the caller side
+                repository.persistAndFlush(newEntity);
+            } catch (PersistenceException e) {
+                throw new ConcurrentModificationException(e);
+            }
+        }
         return value;
     }
 
@@ -99,6 +115,7 @@ public V remove(String key) {
         return value;
     }
 
+    @Transactional
     @Override
     public boolean containsKey(String key) {
         return repository.count("id = ?1", key) == 1;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
index c6e1f20bbe..877abe5f31 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
index 1e9d336c6f..24beb96727 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.oracle.storage;
 
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
index 3af6c90b3a..af2056e276 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.oracle.storage;
 
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
index 8904791889..48478e265f 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import java.util.Optional;
@@ -21,6 +23,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
 
 import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.index.oracle.mapper.ProcessDefinitionEntityMapper;
@@ -66,6 +69,11 @@ public Optional<ProcessDefinitionEntity> findByIdOptional(String key) {
             return repository.findByIdOptional(new ProcessDefinitionEntityId(key));
         }
 
+        @Override
+        public ProcessDefinitionEntity findById(String s, LockModeType lockModeType) {
+            return repository.findById(new ProcessDefinitionEntityId(s), lockModeType);
+        }
+
         @Override
         public void persist(ProcessDefinitionEntity entity) {
             repository.persist(entity);
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
index eafdce9429..587a76a753 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
index 9cc2f50775..50bc2ac5e9 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml
index 72a7a85a63..a0eb9fbf8c 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/META-INF/beans.xml
@@ -1,16 +1,20 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql b/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql
new file mode 100644
index 0000000000..d63ca07505
--- /dev/null
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql
@@ -0,0 +1,32 @@
+create table definitions_annotations
+(
+    value           varchar2(255 char) not null,
+    process_id      varchar2(255 char) not null,
+    process_version varchar2(255 char) not null,
+    primary key (value, process_id, process_version)
+);
+
+create table definitions_metadata
+(
+    process_id      varchar2(255 char) not null,
+    process_version varchar2(255 char) not null,
+    value           varchar2(255 char),
+    key             varchar2(255 char) not null,
+    primary key (process_id, process_version, key)
+);
+
+alter table definitions_annotations
+    add constraint fk_definitions_annotations
+        foreign key (process_id, process_version)
+            references definitions
+            on delete cascade;
+
+alter table definitions_metadata
+    add constraint fk_definitions_metadata
+        foreign key (process_id, process_version)
+            references definitions
+            on delete cascade;
+
+alter table definitions
+    add (description varchar2(255 char));
+
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
index 90a12128c5..61f2659180 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
index fd6dfc2186..669ad5a5d1 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import java.util.Set;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
index 0f03c13933..c521f56d7a 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
index edc6e58da4..7e6cdfebc7 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.mapper;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
index 54905e6d03..1df635219b 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
index 5829e42603..5da3effc8e 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
index c9bd0be583..e174e93610 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
index b357fb1305..a3ecedcce4 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java
index 09123a4a6d..cdcd3cde9d 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/schema/DDLSchemaExporter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.schema;
 
 import java.util.EnumSet;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/AbstractStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/AbstractStorageIT.java
index 6849bfbe98..ac493684bc 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/AbstractStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/AbstractStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import org.kie.kogito.index.oracle.model.AbstractEntity;
@@ -40,22 +42,18 @@ void testStorage(String key, T value1, T value2) {
         Storage<String, T> cache = getStorage().getCache("cache", type);
         assertThat(cache.get(key)).isNull();
         assertThat(cache.containsKey(key)).isFalse();
-        assertThat(getRepository().count()).isZero();
 
         cache.put(key, value1);
         assertThat(cache.get(key)).isEqualTo(value1);
         assertThat(cache.containsKey(key)).isTrue();
-        assertThat(getRepository().count()).isOne();
 
         cache.put(key, value2);
         assertThat(cache.get(key)).isEqualTo(value2);
         assertThat(cache.containsKey(key)).isTrue();
-        assertThat(getRepository().count()).isOne();
 
         cache.remove(key);
         assertThat(cache.get(key)).isNull();
         assertThat(cache.containsKey(key)).isFalse();
-        assertThat(getRepository().count()).isZero();
     }
 
 }
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
index ab4f2d6b5c..46b34dd5c4 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.oracle.storage;
 
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
index 61c53189c4..70ccd3e3df 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
@@ -1,28 +1,28 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import java.util.UUID;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.oracle.model.JobEntity;
@@ -58,14 +58,7 @@ public StorageService getStorage() {
         return storage;
     }
 
-    @BeforeEach
-    @Transactional
-    public void setup() {
-        repository.deleteAll();
-    }
-
     @Test
-    @Transactional
     public void testJobEntity() {
         String jobId = UUID.randomUUID().toString();
         String processInstanceId = UUID.randomUUID().toString();
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
index da331e67c2..644bc7a2e4 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
@@ -1,26 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import java.util.Set;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.index.oracle.model.ProcessDefinitionEntity;
@@ -57,9 +59,8 @@ public StorageService getStorage() {
     }
 
     @Test
-    @Transactional
     void testProcessInstanceEntity() {
-        String processId = "travels";
+        String processId = RandomStringUtils.randomAlphabetic(10);
         String version = "1.0";
         ProcessDefinition pdv1 = TestUtils.createProcessDefinition(processId, version, Set.of("admin", "kogito"));
         ProcessDefinition pdv2 = TestUtils.createProcessDefinition(processId, version, Set.of("kogito"));
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
index e5e7c260a3..52cdb10a44 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import java.util.UUID;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
@@ -59,7 +60,6 @@ public StorageService getStorage() {
     }
 
     @Test
-    @Transactional
     public void testProcessInstanceEntity() {
         String processInstanceId = UUID.randomUUID().toString();
         ProcessInstance processInstance1 = TestUtils
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
index 5369b898ca..bfeff81a75 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.oracle.storage;
 
 import java.util.UUID;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
@@ -61,7 +62,6 @@ public UserTaskInstanceEntityRepository getRepository() {
     }
 
     @Test
-    @Transactional
     public void testUserTaskInstanceEntity() {
         String taskId = UUID.randomUUID().toString();
         String processInstanceId = UUID.randomUUID().toString();
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/resources/application.properties b/data-index/data-index-storage/data-index-storage-oracle/src/test/resources/application.properties
index cc6b5c8d77..6dbb374445 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/resources/application.properties
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Kogito
 kogito.apps.persistence.type=oracle
 # Data source
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/pom.xml b/data-index/data-index-storage/data-index-storage-postgresql-reporting/pom.xml
index aca9115555..41a93869ef 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
index a8b3aa7beb..bbbdd80bdd 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql.reporting.database;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/resources/META-INF/beans.xml
index e99111e29b..ed166fabc6 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/resources/META-INF/beans.xml
@@ -1,15 +1,21 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   -->
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
index e5507c04aa..2fac53c237 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql.reporting;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
index e8c0baf40d..d49e0098d4 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql.reporting.database;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/resources/application.properties b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/resources/application.properties
index 96949082b5..8ff5711746 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/resources/application.properties
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #  Postgresql storage
 kogito.apps.persistence.type=postgresql
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/pom.xml b/data-index/data-index-storage/data-index-storage-postgresql/pom.xml
index 411c7087ca..4f4113ad2b 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-postgresql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapper.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapper.java
index 9b2e762eb5..b864fddbe2 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import org.kie.kogito.index.model.Job;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapper.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapper.java
index ac786e4077..50a3a7fe2a 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapper.java
index ab1e2c0fe6..63a8236f7d 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import org.kie.kogito.index.model.Milestone;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapper.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapper.java
index 77d10b7992..e4fb178938 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapper.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import org.kie.kogito.index.model.UserTaskInstance;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AbstractEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AbstractEntity.java
index 47462ed3ee..8605a3aae0 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AbstractEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AbstractEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.io.Serializable;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
index 765cba4f15..5a628288e1 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.ForeignKey;
 import javax.persistence.Id;
@@ -27,9 +28,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
 @Entity(name = "attachments")
 @Table(name = "attachments")
 public class AttachmentEntity extends AbstractEntity {
@@ -40,8 +38,7 @@ public class AttachmentEntity extends AbstractEntity {
     private String content;
     private String updatedBy;
     private ZonedDateTime updatedAt;
-    @ManyToOne(cascade = CascadeType.ALL, optional = false)
-    @OnDelete(action = OnDeleteAction.CASCADE)
+    @ManyToOne(optional = false)
     @JoinColumn(name = "taskId", foreignKey = @ForeignKey(name = "fk_attachments_tasks"))
     private UserTaskInstanceEntity userTask;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
index 9c244e8096..cdce6fdf61 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.ForeignKey;
 import javax.persistence.Id;
@@ -27,9 +28,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
 @Entity(name = "comments")
 @Table(name = "comments")
 public class CommentEntity extends AbstractEntity {
@@ -39,8 +37,7 @@ public class CommentEntity extends AbstractEntity {
     private String content;
     private String updatedBy;
     private ZonedDateTime updatedAt;
-    @ManyToOne(cascade = CascadeType.ALL, optional = false)
-    @OnDelete(action = OnDeleteAction.CASCADE)
+    @ManyToOne(optional = false)
     @JoinColumn(name = "taskId", foreignKey = @ForeignKey(name = "fk_comments_tasks"))
     private UserTaskInstanceEntity userTask;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
index aa24c7d1a0..5abe456578 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
index 8ad87be815..a6539a8641 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
index 142e1f349a..74b97b526a 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.util.Objects;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntityId.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntityId.java
index e205e35227..4036c81e2c 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntityId.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntityId.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.io.Serializable;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
index c67db1e093..33df9215d9 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.util.Map;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntityId.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntityId.java
index e347a3c488..3a41703f87 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntityId.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntityId.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.io.Serializable;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
index 5c85028b8f..d078189caa 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
index 3f6714e8c8..9da7d4c2b6 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
@@ -1,22 +1,25 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
@@ -29,6 +32,7 @@
 import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.JoinColumn;
+import javax.persistence.MapKeyColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
@@ -46,6 +50,7 @@ public class ProcessDefinitionEntity extends AbstractEntity {
     @Id
     private String version;
     private String name;
+    private String description;
     private String type;
     private byte[] source;
 
@@ -69,6 +74,22 @@ public class ProcessDefinitionEntity extends AbstractEntity {
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "processDefinition")
     private List<NodeEntity> nodes;
+    @ElementCollection
+    @JoinColumn(name = "id")
+    @CollectionTable(name = "definitions_annotations", joinColumns = { @JoinColumn(name = "process_id", referencedColumnName = "id"),
+            @JoinColumn(name = "process_version", referencedColumnName = "version") }, foreignKey = @ForeignKey(name = "fk_definitions_annotations"))
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @Column(name = "value")
+    private Set<String> annotations;
+    @ElementCollection
+    @JoinColumn(name = "id")
+    @CollectionTable(name = "definitions_metadata", joinColumns = {
+            @JoinColumn(name = "process_id", referencedColumnName = "id"), @JoinColumn(name = "process_version", referencedColumnName = "version") },
+            foreignKey = @ForeignKey(name = "fk_definitions_metadata"))
+    @MapKeyColumn(name = "key")
+    @Column(name = "value")
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    private Map<String, String> metadata;
 
     @Override
     public String getId() {
@@ -143,6 +164,30 @@ public void setNodes(List<NodeEntity> nodes) {
         this.nodes = nodes;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Set<String> getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Set<String> annotations) {
+        this.annotations = annotations;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityId.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityId.java
index 0aba5ca672..bea27464d0 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityId.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityId.java
@@ -1,24 +1,29 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.io.Serializable;
 import java.util.Objects;
 
+import static org.kie.kogito.index.model.ProcessDefinition.fromKey;
+import static org.kie.kogito.index.model.ProcessDefinition.toKey;
+
 public class ProcessDefinitionEntityId implements Serializable {
 
     private String id;
@@ -29,9 +34,9 @@ public ProcessDefinitionEntityId() {
     }
 
     public ProcessDefinitionEntityId(String key) {
-        String[] split = key.split("-");
-        this.id = split[0];
-        this.version = split[1];
+        String[] fromKey = fromKey(key);
+        this.id = fromKey[0];
+        this.version = fromKey[1];
     }
 
     public ProcessDefinitionEntityId(String id, String version) {
@@ -40,7 +45,7 @@ public ProcessDefinitionEntityId(String id, String version) {
     }
 
     public String getKey() {
-        return String.format("%s-%s", id, version);
+        return toKey(id, version);
     }
 
     public String getId() {
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
index 198cd99b21..3e938f32f3 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
index bedc0c6851..cbb6799469 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
index 202b94546d..fd0be9cb12 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
index 2658f6f94b..14b2354340 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.util.Objects;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
index c757982177..99fbd674e8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import java.time.ZonedDateTime;
@@ -26,6 +28,7 @@
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.ForeignKey;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
@@ -97,9 +100,9 @@ public class UserTaskInstanceEntity extends AbstractEntity {
     @Column(columnDefinition = "jsonb")
     private ObjectNode outputs;
     private String endpoint;
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask")
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask", orphanRemoval = true, fetch = FetchType.LAZY)
     private List<CommentEntity> comments;
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask")
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "userTask", orphanRemoval = true, fetch = FetchType.LAZY)
     private List<AttachmentEntity> attachments;
 
     @Override
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
index a36b9f91df..b5f77f7b24 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
index 2118fa991d..dd4135b023 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
@@ -1,24 +1,29 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
+import java.util.ConcurrentModificationException;
 import java.util.Map;
 import java.util.function.Function;
 
+import javax.persistence.LockModeType;
+import javax.persistence.PersistenceException;
 import javax.transaction.Transactional;
 
 import org.kie.kogito.index.postgresql.model.AbstractEntity;
@@ -83,8 +88,19 @@ public V get(String key) {
     @Override
     @Transactional
     public V put(String key, V value) {
-        repository.deleteById(key);
-        repository.persist(mapToEntity.apply(value));
+        //Pessimistic lock is used to lock the row to handle concurrency with an exiting registry
+        E persistedEntity = repository.findById(key, LockModeType.PESSIMISTIC_WRITE);
+        E newEntity = mapToEntity.apply(value);
+        if (persistedEntity != null) {
+            repository.getEntityManager().merge(newEntity);
+        } else {
+            try {
+                //to handle concurrency in case of a new registry persist flush and throw an exception to allow retry on the caller side
+                repository.persistAndFlush(newEntity);
+            } catch (PersistenceException e) {
+                throw new ConcurrentModificationException(e);
+            }
+        }
         return value;
     }
 
@@ -98,6 +114,7 @@ public V remove(String key) {
         return value;
     }
 
+    @Transactional
     @Override
     public boolean containsKey(String key) {
         return repository.count("id = ?1", key) == 1;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
index 6e5f96f492..a738deb083 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
index 3e6ce9e28d..da5d5dd540 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql.storage;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
index 05fed40714..413e0a2b77 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql.storage;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
index 2e5eef7588..38d60c065f 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import java.util.Optional;
@@ -21,6 +23,8 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.transaction.Transactional;
 
 import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.index.postgresql.mapper.ProcessDefinitionEntityMapper;
@@ -42,6 +46,7 @@ public ProcessDefinitionEntityStorage(ProcessDefinitionEntityRepository reposito
                 e.getVersion()).getKey());
     }
 
+    @Transactional
     @Override
     public boolean containsKey(String key) {
         ProcessDefinitionEntityId id = new ProcessDefinitionEntityId(key);
@@ -66,6 +71,11 @@ public Optional<ProcessDefinitionEntity> findByIdOptional(String key) {
             return repository.findByIdOptional(new ProcessDefinitionEntityId(key));
         }
 
+        @Override
+        public ProcessDefinitionEntity findById(String s, LockModeType lockModeType) {
+            return repository.findById(new ProcessDefinitionEntityId(s), lockModeType);
+        }
+
         @Override
         public void persist(ProcessDefinitionEntity entity) {
             repository.persist(entity);
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
index 5b6313f03d..12e3960b0e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
index cc1ba8aebf..ed7281b75e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/beans.xml
index 72a7a85a63..a0eb9fbf8c 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/beans.xml
@@ -1,16 +1,20 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql
index 58cbc17bce..5499ecb057 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql
@@ -1,4 +1,4 @@
-create table attachments
+create table IF NOT EXISTS attachments
 (
     id         varchar(255) not null,
     content    varchar(255),
@@ -9,7 +9,7 @@ create table attachments
     primary key (id)
 );
 
-create table comments
+create table IF NOT EXISTS comments
 (
     id         varchar(255) not null,
     content    varchar(255),
@@ -19,7 +19,7 @@ create table comments
     primary key (id)
 );
 
-create table jobs
+create table IF NOT EXISTS jobs
 (
     id                       varchar(255) not null,
     callback_endpoint        varchar(255),
@@ -41,7 +41,7 @@ create table jobs
     primary key (id)
 );
 
-create table milestones
+create table IF NOT EXISTS milestones
 (
     id                  varchar(255) not null,
     process_instance_id varchar(255) not null,
@@ -50,7 +50,7 @@ create table milestones
     primary key (id, process_instance_id)
 );
 
-create table nodes
+create table IF NOT EXISTS nodes
 (
     id                  varchar(255) not null,
     definition_id       varchar(255),
@@ -63,7 +63,7 @@ create table nodes
     primary key (id)
 );
 
-create table processes
+create table IF NOT EXISTS processes
 (
     id                         varchar(255) not null,
     business_key               varchar(255),
@@ -83,21 +83,21 @@ create table processes
     primary key (id)
 );
 
-create table processes_addons
+create table IF NOT EXISTS processes_addons
 (
     process_id varchar(255) not null,
     addon      varchar(255) not null,
     primary key (process_id, addon)
 );
 
-create table processes_roles
+create table IF NOT EXISTS processes_roles
 (
     process_id varchar(255) not null,
     role       varchar(255) not null,
     primary key (process_id, role)
 );
 
-create table tasks
+create table IF NOT EXISTS tasks
 (
     id                       varchar(255) not null,
     actual_owner             varchar(255),
@@ -119,41 +119,45 @@ create table tasks
     primary key (id)
 );
 
-create table tasks_admin_groups
+create table IF NOT EXISTS tasks_admin_groups
 (
     task_id  varchar(255) not null,
     group_id varchar(255) not null,
     primary key (task_id, group_id)
 );
 
-create table tasks_admin_users
+create table IF NOT EXISTS tasks_admin_users
 (
     task_id varchar(255) not null,
     user_id varchar(255) not null,
     primary key (task_id, user_id)
 );
 
-create table tasks_excluded_users
+create table IF NOT EXISTS tasks_excluded_users
 (
     task_id varchar(255) not null,
     user_id varchar(255) not null,
     primary key (task_id, user_id)
 );
 
-create table tasks_potential_groups
+create table IF NOT EXISTS tasks_potential_groups
 (
     task_id  varchar(255) not null,
     group_id varchar(255) not null,
     primary key (task_id, group_id)
 );
 
-create table tasks_potential_users
+create table IF NOT EXISTS tasks_potential_users
 (
     task_id varchar(255) not null,
     user_id varchar(255) not null,
     primary key (task_id, user_id)
 );
 
+alter table if exists attachments
+  drop constraint if exists fk_attachments_tasks
+cascade;
+
 alter table if exists attachments
     add constraint fk_attachments_tasks
     foreign key (task_id)
@@ -162,6 +166,10 @@ alter table if exists attachments
 delete
 cascade;
 
+alter table if exists comments
+  drop constraint if exists fk_comments_tasks
+cascade;
+
 alter table if exists comments
     add constraint fk_comments_tasks
     foreign key (task_id)
@@ -170,6 +178,10 @@ alter table if exists comments
 delete
 cascade;
 
+alter table if exists milestones
+drop constraint if exists fk_milestones_process
+cascade;
+
 alter table if exists milestones
     add constraint fk_milestones_process
     foreign key (process_instance_id)
@@ -178,6 +190,10 @@ alter table if exists milestones
 delete
 cascade;
 
+alter table if exists nodes
+drop constraint if exists fk_nodes_process
+cascade;
+
 alter table if exists nodes
     add constraint fk_nodes_process
     foreign key (process_instance_id)
@@ -186,6 +202,10 @@ alter table if exists nodes
 delete
 cascade;
 
+alter table if exists processes_addons
+drop constraint if exists fk_processes_addons_processes
+cascade;
+
 alter table if exists processes_addons
     add constraint fk_processes_addons_processes
     foreign key (process_id)
@@ -194,6 +214,10 @@ alter table if exists processes_addons
 delete
 cascade;
 
+alter table if exists processes_roles
+drop constraint if exists fk_processes_roles_processes
+cascade;
+
 alter table if exists processes_roles
     add constraint fk_processes_roles_processes
     foreign key (process_id)
@@ -202,6 +226,10 @@ alter table if exists processes_roles
 delete
 cascade;
 
+alter table if exists tasks_admin_groups
+drop constraint if exists fk_tasks_admin_groups_tasks
+cascade;
+
 alter table if exists tasks_admin_groups
     add constraint fk_tasks_admin_groups_tasks
     foreign key (task_id)
@@ -210,6 +238,10 @@ alter table if exists tasks_admin_groups
 delete
 cascade;
 
+alter table if exists tasks_admin_users
+drop constraint if exists fk_tasks_admin_users_tasks
+cascade;
+
 alter table if exists tasks_admin_users
     add constraint fk_tasks_admin_users_tasks
     foreign key (task_id)
@@ -218,6 +250,10 @@ alter table if exists tasks_admin_users
 delete
 cascade;
 
+alter table if exists tasks_excluded_users
+drop constraint if exists fk_tasks_excluded_users_tasks
+cascade;
+
 alter table if exists tasks_excluded_users
     add constraint fk_tasks_excluded_users_tasks
     foreign key (task_id)
@@ -226,6 +262,10 @@ alter table if exists tasks_excluded_users
 delete
 cascade;
 
+alter table if exists tasks_potential_groups
+drop constraint if exists fk_tasks_potential_groups_tasks
+cascade;
+
 alter table if exists tasks_potential_groups
     add constraint fk_tasks_potential_groups_tasks
     foreign key (task_id)
@@ -234,6 +274,10 @@ alter table if exists tasks_potential_groups
 delete
 cascade;
 
+alter table if exists tasks_potential_users
+drop constraint if exists fk_tasks_potential_users_tasks
+cascade;
+
 alter table if exists tasks_potential_users
     add constraint fk_tasks_potential_users_tasks
     foreign key (task_id)
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql
index 407913ff70..6c7937a44e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.44.0__data_index_definitions.sql
@@ -1,4 +1,4 @@
-create table definitions
+create table IF NOT EXISTS definitions
 (
     id       varchar(255) not null,
     version  varchar(255) not null,
@@ -9,7 +9,7 @@ create table definitions
     primary key (id, version)
 );
 
-create table definitions_addons
+create table IF NOT EXISTS definitions_addons
 (
     process_id      varchar(255) not null,
     process_version varchar(255) not null,
@@ -17,7 +17,7 @@ create table definitions_addons
     primary key (process_id, process_version, addon)
 );
 
-create table definitions_roles
+create table IF NOT EXISTS definitions_roles
 (
     process_id      varchar(255) not null,
     process_version varchar(255) not null,
@@ -25,6 +25,10 @@ create table definitions_roles
     primary key (process_id, process_version, role)
 );
 
+alter table if exists definitions_addons
+drop constraint if exists fk_definitions_addons_definitions
+cascade;
+
 alter table if exists definitions_addons
     add constraint fk_definitions_addons_definitions
     foreign key (process_id, process_version)
@@ -33,6 +37,10 @@ alter table if exists definitions_addons
 delete
 cascade;
 
+alter table if exists definitions_roles
+drop constraint if exists fk_definitions_roles_definitions
+cascade;
+
 alter table if exists definitions_roles
     add constraint fk_definitions_roles_definitions
     foreign key (process_id, process_version)
@@ -42,4 +50,4 @@ delete
 cascade;
 
 alter table if exists processes
-    add column version varchar (255);
+    add column IF NOT EXISTS version varchar (255);
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql
index 8b5f79995b..5332c4946d 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.0__data_index_node_definitions.sql
@@ -1,4 +1,4 @@
-create table definitions_nodes
+create table IF NOT EXISTS definitions_nodes
 (
     id              varchar(255) not null,
     name            varchar(255),
@@ -9,7 +9,7 @@ create table definitions_nodes
     primary key (id, process_id, process_version)
 );
 
-create table definitions_nodes_metadata
+create table IF NOT EXISTS definitions_nodes_metadata
 (
     node_id         varchar(255) not null,
     process_id      varchar(255) not null,
@@ -18,6 +18,9 @@ create table definitions_nodes_metadata
     key             varchar(255) not null,
     primary key (node_id, process_id, process_version, key)
 );
+alter table if exists definitions_nodes
+drop constraint if exists fk_definitions_nodes_definitions
+cascade;
 
 alter table if exists definitions_nodes
     add constraint fk_definitions_nodes_definitions
@@ -27,6 +30,10 @@ alter table if exists definitions_nodes
 delete
 cascade;
 
+alter table if exists definitions_nodes_metadata
+drop constraint if exists fk_definitions_nodes_metadata_definitions_nodes
+cascade;
+
 alter table if exists definitions_nodes_metadata
     add constraint fk_definitions_nodes_metadata_definitions_nodes
     foreign key (node_id, process_id, process_version)
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql
index c942bfeb96..dc94cd5caf 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.1__add_identity_to_process_instance.sql
@@ -1,3 +1,3 @@
-ALTER TABLE processes
-    ADD COLUMN created_by character varying,
-    ADD COLUMN updated_by character varying;
\ No newline at end of file
+ALTER TABLE IF exists processes
+    ADD COLUMN IF NOT EXISTS created_by character varying,
+    ADD COLUMN IF NOT EXISTS updated_by character varying;
\ No newline at end of file
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql
new file mode 100644
index 0000000000..c976a3ee0b
--- /dev/null
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.45.0.2__data_index_definitions_add_collums.sql
@@ -0,0 +1,35 @@
+create table definitions_annotations
+(
+    value           varchar(255) not null,
+    process_id      varchar(255) not null,
+    process_version varchar(255) not null,
+    primary key (value, process_id, process_version)
+);
+
+create table definitions_metadata
+(
+    process_id      varchar(255) not null,
+    process_version varchar(255) not null,
+    value           varchar(255),
+    key             varchar(255) not null,
+    primary key (process_id, process_version, key)
+);
+
+alter table if exists definitions_annotations
+    add constraint fk_definitions_annotations
+    foreign key (process_id, process_version)
+    references definitions
+    on
+delete
+cascade;
+
+alter table if exists definitions_metadata
+    add constraint fk_definitions_metadata
+    foreign key (process_id, process_version)
+    references definitions
+    on
+delete
+cascade;
+
+alter table if exists definitions
+    add column description varchar (255);
\ No newline at end of file
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/readme.txt b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/readme.txt
new file mode 100644
index 0000000000..e08db4d0ae
--- /dev/null
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/readme.txt
@@ -0,0 +1,2 @@
+Ensure migration scripts are developed to support several executions over the same database without any error.
+This feature will make sure this migration execution would be compatible with other needed flyway migrations without broking the chain.
\ No newline at end of file
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
index 0dddb30c07..96a36f757b 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
index 9f9ce07f41..8fbb3ed040 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import java.util.Set;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
index fdcfdab19e..14a7d89b5a 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
index b991c844fe..9d0a71005f 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.mapper;
 
 import java.time.ZonedDateTime;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
index fc48c8fb0c..abfe0411e3 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
index a7fd475db0..3cbb177ac4 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
index 60760dc54e..f8fe9be76e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
index 8435d0285d..126f642b33 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.query;
 
 import javax.inject.Inject;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
index c2e13d15b5..6022ec6883 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/schema/DDLSchemaExporter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.schema;
 
 import java.util.EnumSet;
@@ -37,6 +39,7 @@
 import org.kie.kogito.index.postgresql.model.ProcessInstanceEntity;
 import org.kie.kogito.index.postgresql.model.ProcessInstanceErrorEntity;
 import org.kie.kogito.index.postgresql.model.UserTaskInstanceEntity;
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -44,7 +47,7 @@ public class DDLSchemaExporter {
 
     public static void main(String[] args) {
         try (KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer()) {
-            postgresql.waitingFor(Wait.forListeningPort());
+            postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
             postgresql.start();
             Map<String, String> settings = new HashMap<>();
             settings.put(Environment.URL, postgresql.getJdbcUrl());
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java
index 4805235391..95121a5e6c 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/AbstractStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import org.kie.kogito.index.postgresql.model.AbstractEntity;
@@ -40,22 +42,18 @@ void testStorage(String key, T value1, T value2) {
         Storage<String, T> cache = getStorage().getCache("cache", type);
         assertThat(cache.get(key)).isNull();
         assertThat(cache.containsKey(key)).isFalse();
-        assertThat(getRepository().count()).isZero();
 
         cache.put(key, value1);
         assertThat(cache.get(key)).isEqualTo(value1);
         assertThat(cache.containsKey(key)).isTrue();
-        assertThat(getRepository().count()).isOne();
 
         cache.put(key, value2);
         assertThat(cache.get(key)).isEqualTo(value2);
         assertThat(cache.containsKey(key)).isTrue();
-        assertThat(getRepository().count()).isOne();
 
         cache.remove(key);
         assertThat(cache.get(key)).isNull();
         assertThat(cache.containsKey(key)).isFalse();
-        assertThat(getRepository().count()).isZero();
     }
 
 }
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
index a614255fa3..c39f5e2f6d 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.postgresql.storage;
 
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
index 6b27fbc491..b3845d8349 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
@@ -1,28 +1,28 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import java.util.UUID;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.postgresql.model.JobEntity;
@@ -58,14 +58,7 @@ public StorageService getStorage() {
         return storage;
     }
 
-    @BeforeEach
-    @Transactional
-    public void setup() {
-        repository.deleteAll();
-    }
-
     @Test
-    @Transactional
     public void testJobEntity() {
         String jobId = UUID.randomUUID().toString();
         String processInstanceId = UUID.randomUUID().toString();
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
index a928c69ae5..111d71d418 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
@@ -1,26 +1,28 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import java.util.Set;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.index.postgresql.model.ProcessDefinitionEntity;
@@ -57,9 +59,8 @@ public StorageService getStorage() {
     }
 
     @Test
-    @Transactional
     void testProcessInstanceEntity() {
-        String processId = "travels";
+        String processId = RandomStringUtils.randomAlphabetic(10);
         String version = "1.0";
         ProcessDefinition pdv1 = TestUtils.createProcessDefinition(processId, version, Set.of("admin", "kogito"));
         ProcessDefinition pdv2 = TestUtils.createProcessDefinition(processId, version, Set.of("kogito"));
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
index 8fefdc1e16..326229c139 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import java.util.UUID;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
@@ -59,7 +60,6 @@ public StorageService getStorage() {
     }
 
     @Test
-    @Transactional
     public void testProcessInstanceEntity() {
         String processInstanceId = UUID.randomUUID().toString();
         ProcessInstance processInstance1 = TestUtils
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
index 232e6cd71c..f64359fdf8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.postgresql.storage;
 
 import java.util.UUID;
 
 import javax.inject.Inject;
-import javax.transaction.Transactional;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Test;
@@ -58,7 +59,6 @@ public UserTaskInstanceEntityRepository getRepository() {
     }
 
     @Test
-    @Transactional
     public void testUserTaskInstanceEntity() {
         String taskId = UUID.randomUUID().toString();
         String processInstanceId = UUID.randomUUID().toString();
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties b/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties
index 2e3627afaa..517ca87684 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Kogito
 kogito.apps.persistence.type=postgresql
 # Data source
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/pom.xml b/data-index/data-index-storage/data-index-storage-protobuf/pom.xml
index 1c1bedd084..b34b7a900b 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-protobuf/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java b/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
index fb1fa800b8..f08e7b0572 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
+++ b/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.protobuf;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/beans.xml b/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/beans.xml
+++ b/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto b/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto
index e8b7eed338..a2315f0211 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto
+++ b/data-index/data-index-storage/data-index-storage-protobuf/src/main/resources/META-INF/kogito-index.proto
@@ -62,6 +62,17 @@ message ProcessDefinition {
     optional string endpoint = 7;
     optional bytes source = 8;
     repeated Node nodes = 9;
+    optional string description = 10;
+    repeated string annotations = 11;
+    repeated Entry metadata = 12;
+
+}
+
+message Entry {
+    /* @Field(store = Store.YES) */
+    optional string key = 1;
+    /* @Field(store = Store.YES) */
+    optional string value = 2;
 }
 
 /* @Indexed */
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/src/test/java/org/kie/kogito/index/protobuf/ProtostreamProducerTest.java b/data-index/data-index-storage/data-index-storage-protobuf/src/test/java/org/kie/kogito/index/protobuf/ProtostreamProducerTest.java
index a758fd0289..7454ac1292 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/src/test/java/org/kie/kogito/index/protobuf/ProtostreamProducerTest.java
+++ b/data-index/data-index-storage/data-index-storage-protobuf/src/test/java/org/kie/kogito/index/protobuf/ProtostreamProducerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.protobuf;
 
 import java.io.IOException;
diff --git a/data-index/data-index-storage/pom.xml b/data-index/data-index-storage/pom.xml
index 848c285bac..35836fbe31 100644
--- a/data-index/data-index-storage/pom.xml
+++ b/data-index/data-index-storage/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-test-utils/pom.xml b/data-index/data-index-test-utils/pom.xml
index 09929bc2ae..69cf0c05f9 100644
--- a/data-index/data-index-test-utils/pom.xml
+++ b/data-index/data-index-test-utils/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/Constants.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/Constants.java
index 3cc6a0dbae..8569591d6d 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/Constants.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test;
 
 public class Constants {
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java
index 95ee2eb5ba..b9a8acc347 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/TestUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.test;
 
@@ -21,7 +24,6 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -33,15 +35,23 @@
 import java.util.UUID;
 
 import org.eclipse.microprofile.config.ConfigProvider;
-import org.kie.kogito.event.process.AttachmentEventBody;
-import org.kie.kogito.event.process.CommentEventBody;
-import org.kie.kogito.event.process.MilestoneEventBody;
-import org.kie.kogito.event.process.NodeInstanceEventBody;
-import org.kie.kogito.event.process.ProcessErrorEventBody;
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.ProcessInstanceEventBody;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceEventBody;
+import org.kie.kogito.event.process.NodeDefinition;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionEventBody;
+import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceErrorEventBody;
+import org.kie.kogito.event.process.ProcessInstanceEventMetadata;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateEventBody;
+import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceVariableEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceCommentEventBody;
+import org.kie.kogito.event.usertask.UserTaskInstanceEventMetadata;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
+import org.kie.kogito.event.usertask.UserTaskInstanceStateEventBody;
 import org.kie.kogito.index.event.KogitoJobCloudEvent;
 import org.kie.kogito.index.model.Attachment;
 import org.kie.kogito.index.model.Comment;
@@ -56,13 +66,14 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import static java.util.Collections.emptyMap;
 import static java.util.Collections.singleton;
 import static org.kie.kogito.index.json.JsonUtils.getObjectMapper;
 
 public final class TestUtils {
 
     private static final String MILESTONE_ID = UUID.randomUUID().toString();
+    public static final String ADDONS = "jobs-management,prometheus-monitoring,process-management";
+    public static final String PROCESS_VERSION = "1.0";
 
     private TestUtils() {
     }
@@ -93,54 +104,111 @@ public static String readFileContent(String file) throws IOException {
         }
     }
 
-    public static ProcessInstanceDataEvent getProcessCloudEvent(String processId, String processInstanceId, ProcessInstanceState status, String rootProcessInstanceId, String rootProcessId,
+    public static ProcessDefinitionDataEvent getProcessDefinitionDataEvent(String processId) {
+        ProcessDefinitionEventBody body = ProcessDefinitionEventBody.builder()
+                .setVersion(PROCESS_VERSION)
+                .setId(processId)
+                .setName(getProcessName(processId))
+                .setDescription("new definition for testing")
+                .setAddons(Set.of(ADDONS.split(",")))
+                .setAnnotations(Set.of("annotation1", "annotation2"))
+                .setMetadata(Map.of("meta1", "value1", "meta2", "value2"))
+                .setRoles(Set.of("admin"))
+                .setNodes(List.of(NodeDefinition.builder().setName("node1").setId("id1").build()))
+                .setEndpoint(getEndpoint(processId))
+                .build();
+
+        return new ProcessDefinitionDataEvent(body);
+    }
+
+    public static ProcessInstanceStateDataEvent getProcessCloudEvent(String processId, String processInstanceId, ProcessInstanceState status, String rootProcessInstanceId, String rootProcessId,
             String parentProcessInstanceId, String identity) {
 
-        ProcessInstanceEventBody body = ProcessInstanceEventBody.create()
-                .id(processInstanceId)
+        int eventType = status.equals(ProcessInstanceState.COMPLETED) ? ProcessInstanceStateEventBody.EVENT_TYPE_ENDED : ProcessInstanceStateEventBody.EVENT_TYPE_STARTED;
+        ProcessInstanceStateEventBody body = ProcessInstanceStateEventBody.create()
+                .processInstanceId(processInstanceId)
                 .parentInstanceId(parentProcessInstanceId)
-                .rootInstanceId(rootProcessInstanceId)
-                .processId(processId)
-                .version("1.0")
+                .rootProcessInstanceId(rootProcessInstanceId)
                 .rootProcessId(rootProcessId)
-                .processName(String.format("%s-name", processId))
-                .startDate(new Date())
-                .endDate(status == ProcessInstanceState.COMPLETED ? Date.from(Instant.now().plus(1, ChronoUnit.HOURS)) : null)
+                .processId(processId)
+                .processVersion(PROCESS_VERSION)
+                .processName(getProcessName(processId))
+                .eventDate(new Date())
                 .state(status.ordinal())
-                .businessKey(String.format("%s-key", processId))
-                .identity(identity)
-                .variables(getProcessInstanceVariablesMap())
-                .milestones(Set.of(
-                        MilestoneEventBody.create()
-                                .id(MILESTONE_ID)
-                                .name("SimpleMilestone")
-                                .status(MilestoneStatus.AVAILABLE.name())
-                                .build()))
+                .businessKey(processInstanceId)
                 .roles("admin")
-                .nodeInstance(NodeInstanceEventBody.create()
-                        .id(processInstanceId + "-1")
-                        .triggerTime(new Date())
-                        .nodeName("Start")
-                        .nodeType("StartNode")
-                        .nodeId("1")
-                        .nodeDefinitionId("StartEvent_1")
-                        .leaveTime(status == ProcessInstanceState.COMPLETED ? Date.from(Instant.now().plus(1, ChronoUnit.HOURS)) : null)
-                        .build())
-                .error(status == ProcessInstanceState.ERROR ? ProcessErrorEventBody.create()
-                        .nodeDefinitionId("StartEvent_1")
-                        .errorMessage("Something went wrong")
-                        .build() : null)
+                .eventUser(identity)
+                .eventType(eventType)
+                .build();
+
+        return new ProcessInstanceStateDataEvent(URI.create("http://localhost:8080/" + processId).toString(), "jobs-management,prometheus-monitoring,process-management", (String) identity,
+                body.metaData(), body);
+
+    }
+
+    public static ProcessInstanceErrorDataEvent deriveErrorProcessCloudEvent(ProcessInstanceStateDataEvent event, String errorMessage, String nodeDefinition, String nodeInstanceId) {
+
+        ProcessInstanceErrorEventBody body = ProcessInstanceErrorEventBody.create()
+                .eventDate(new Date())
+                .eventUser(event.getData().getEventUser())
+                .processId(event.getData().getProcessId())
+                .processInstanceId(event.getData().getProcessInstanceId())
+                .processVersion(event.getData().getProcessVersion())
+                .errorMessage(errorMessage)
+                .nodeDefinitionId(nodeDefinition)
+                .nodeInstanceId(nodeInstanceId)
+                .build();
+
+        Map<String, Object> metadata = new HashMap<>();
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_INSTANCE_ID_META_DATA, event.getKogitoProcessInstanceId());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_VERSION_META_DATA, event.getKogitoProcessInstanceVersion());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_ID_META_DATA, event.getKogitoProcessId());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_INSTANCE_STATE_META_DATA, event.getKogitoProcessInstanceState());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_TYPE_META_DATA, event.getKogitoProcessType());
+        metadata.put(ProcessInstanceEventMetadata.PARENT_PROCESS_INSTANCE_ID_META_DATA, event.getKogitoParentProcessInstanceId());
+        metadata.put(ProcessInstanceEventMetadata.ROOT_PROCESS_ID_META_DATA, event.getKogitoRootProcessId());
+        metadata.put(ProcessInstanceEventMetadata.ROOT_PROCESS_INSTANCE_ID_META_DATA, event.getKogitoRootProcessInstanceId());
+
+        return new ProcessInstanceErrorDataEvent(event.getSource().toString(), event.getKogitoAddons(), event.getKogitoIdentity(), metadata, body);
+
+    }
+
+    public static ProcessInstanceVariableDataEvent deriveProcessVariableCloudEvent(ProcessInstanceStateDataEvent event, String variableName, Object value) {
+
+        ProcessInstanceVariableEventBody body = ProcessInstanceVariableEventBody.create()
+                .eventDate(new Date())
+                .eventUser(event.getData().getEventUser())
+                .variableId(variableName)
+                .variableName(variableName)
+                .variableValue(value)
+                .processId(event.getData().getProcessId())
+                .processInstanceId(event.getData().getProcessInstanceId())
+                .processVersion(event.getData().getProcessVersion())
                 .build();
+        Map<String, Object> metadata = new HashMap<>();
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_INSTANCE_ID_META_DATA, event.getKogitoProcessInstanceId());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_VERSION_META_DATA, event.getKogitoProcessInstanceVersion());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_ID_META_DATA, event.getKogitoProcessId());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_INSTANCE_STATE_META_DATA, event.getKogitoProcessInstanceState());
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_TYPE_META_DATA, event.getKogitoProcessType());
+        metadata.put(ProcessInstanceEventMetadata.PARENT_PROCESS_INSTANCE_ID_META_DATA, event.getKogitoParentProcessInstanceId());
+        metadata.put(ProcessInstanceEventMetadata.ROOT_PROCESS_ID_META_DATA, event.getKogitoRootProcessId());
+        metadata.put(ProcessInstanceEventMetadata.ROOT_PROCESS_INSTANCE_ID_META_DATA, event.getKogitoRootProcessInstanceId());
+
+        return new ProcessInstanceVariableDataEvent(event.getSource().toString(), event.getKogitoAddons(), event.getKogitoIdentity(), metadata, body);
+
+    }
 
-        return new ProcessInstanceDataEvent(URI.create("http://localhost:8080/" + processId).toString(), "jobs-management,prometheus-monitoring,process-management", identity, body.metaData(), body);
+    private static String getProcessName(String processId) {
+        return String.format("%s-name", processId);
     }
 
     public static ProcessInstance getProcessInstance(String processId, String processInstanceId, Integer status, String rootProcessInstanceId, String rootProcessId) {
         ProcessInstance pi = new ProcessInstance();
         pi.setId(processInstanceId);
         pi.setProcessId(processId);
-        pi.setVersion("1.0");
-        pi.setProcessName(String.format("%s-name", processId));
+        pi.setVersion(PROCESS_VERSION);
+        pi.setProcessName(getProcessName(processId));
         pi.setRootProcessInstanceId(rootProcessInstanceId);
         pi.setParentProcessInstanceId(rootProcessInstanceId);
         pi.setRootProcessId(rootProcessId);
@@ -201,56 +269,105 @@ private static ObjectNode getProcessInstanceVariablesJson() {
         return getObjectMapper().valueToTree(getProcessInstanceVariablesMap());
     }
 
-    public static UserTaskInstanceDataEvent getUserTaskCloudEvent(String taskId, String processId, String processInstanceId, String rootProcessInstanceId, String rootProcessId, String state) {
-        return getUserTaskCloudEvent(taskId, processId, processInstanceId, rootProcessInstanceId, rootProcessId, state, "kogito");
+    public static UserTaskInstanceStateDataEvent getUserTaskCloudEvent(String taskId, String processId, String processInstanceId, String rootProcessInstanceId, String rootProcessId, String state) {
+        return getUserTaskCloudEvent(taskId, processId, processInstanceId, rootProcessInstanceId, rootProcessId, state, "kogito", 1);
     }
 
-    public static UserTaskInstanceDataEvent getUserTaskCloudEvent(String taskId, String processId, String processInstanceId, String rootProcessInstanceId, String rootProcessId, String state,
-            String actualOwner) {
+    public static UserTaskInstanceStateDataEvent getUserTaskCloudEvent(String taskId, String processId, String processInstanceId, String rootProcessInstanceId, String rootProcessId, String state,
+            String actualOwner, Integer eventType) {
 
-        UserTaskInstanceEventBody body = UserTaskInstanceEventBody.create()
-                .id(taskId)
+        UserTaskInstanceStateEventBody body = UserTaskInstanceStateEventBody.create()
+                .eventType(eventType)
+                .userTaskInstanceId(taskId)
                 .state(state)
-                .taskName("TaskName")
-                .taskDescription("TaskDescription")
-                .taskPriority("High")
+                .userTaskName("TaskName")
+                .userTaskDescription("TaskDescription")
+                .userTaskPriority("High")
                 .actualOwner(actualOwner)
-                .startDate(new Date())
-                .completeDate(Date.from(Instant.now().plus(1, ChronoUnit.HOURS)))
-                .adminGroups(singleton("admin"))
-                .adminUsers(singleton("kogito"))
-                .excludedUsers(singleton("excluded"))
-                .potentialGroups(singleton("potentialGroup"))
-                .potentialUsers(singleton("potentialUser"))
+                .eventDate(new Date())
                 .processInstanceId(processInstanceId)
-                .rootProcessInstanceId(rootProcessInstanceId)
-                .processId(processId)
-                .rootProcessId(rootProcessId)
-                .comments(singleton(getTaskComment("commentId" + taskId, "kogito", "Comment 1")))
-                .attachments(singleton(getTaskAttachment("attachmentId" + taskId, "kogito", "http://linltodoc.com/1", "doc1")))
-                .inputs(emptyMap())
-                .outputs(emptyMap())
                 .build();
+        UserTaskInstanceStateDataEvent event = new UserTaskInstanceStateDataEvent(URI.create("http://localhost:8080/" + processId).toString(), null, null, body.metaData(), body);
+        event.setKogitoProcessId(processId);
+        event.setKogitoProcessInstanceId(processInstanceId);
+        event.setKogitoRootProcessId(rootProcessId);
+        event.setKogitoRootProcessInstanceId(rootProcessInstanceId);
+        return event;
+    }
+
+    public static UserTaskInstanceAttachmentDataEvent getUserTaskAttachmentEvent(String taskId, String processId, String processInstanceId, String rootProcessInstanceId, String rootProcessId,
+            String state,
+            String actualOwner, String attachmentId, URI attachmentURI, String attachmentName, Integer eventType) {
+
+        UserTaskInstanceAttachmentEventBody attachmentBody = UserTaskInstanceAttachmentEventBody.create()
+                .attachmentId(attachmentId)
+                .attachmentName(attachmentName)
+                .attachmentURI(attachmentURI)
+                .eventDate(new Date())
+                .eventType(UserTaskInstanceAttachmentEventBody.EVENT_TYPE_ADDED)
+                .userTaskInstanceId(taskId)
+                .build();
+
+        Map<String, Object> metadata = new HashMap<>();
+        metadata.put(UserTaskInstanceEventMetadata.USER_TASK_INSTANCE_ID_META_DATA, taskId);
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_INSTANCE_ID_META_DATA, processInstanceId);
+        metadata.put(UserTaskInstanceEventMetadata.USER_TASK_INSTANCE_STATE_META_DATA, state);
+
+        UserTaskInstanceAttachmentDataEvent attachmentEvent =
+                new UserTaskInstanceAttachmentDataEvent(URI.create("http://localhost:8080/" + processId).toString(), null, null, metadata, attachmentBody);
+        attachmentEvent.setKogitoProcessId(processId);
+        attachmentEvent.setKogitoProcessInstanceId(processInstanceId);
+        attachmentEvent.setKogitoRootProcessId(rootProcessId);
+        attachmentEvent.setKogitoRootProcessInstanceId(rootProcessInstanceId);
+        return attachmentEvent;
+    }
+
+    public static UserTaskInstanceCommentDataEvent getUserTaskCommentEvent(String taskId, String processId, String processInstanceId, String rootProcessInstanceId, String rootProcessId,
+            String state,
+            String actualOwner, String commentId, String commentContent, Integer eventType) {
+
+        UserTaskInstanceCommentEventBody attachmentBody = UserTaskInstanceCommentEventBody.create()
+                .commentId(commentId)
+                .commentContent(commentContent)
+                .eventDate(new Date())
+                .eventType(UserTaskInstanceAttachmentEventBody.EVENT_TYPE_ADDED)
+                .userTaskInstanceId(taskId)
+                .build();
+
+        Map<String, Object> metadata = new HashMap<>();
+        metadata.put(UserTaskInstanceEventMetadata.USER_TASK_INSTANCE_ID_META_DATA, taskId);
+        metadata.put(ProcessInstanceEventMetadata.PROCESS_INSTANCE_ID_META_DATA, processInstanceId);
+        metadata.put(UserTaskInstanceEventMetadata.USER_TASK_INSTANCE_STATE_META_DATA, state);
+
+        UserTaskInstanceCommentDataEvent attachmentEvent =
+                new UserTaskInstanceCommentDataEvent(URI.create("http://localhost:8080/" + processId).toString(), null, null, metadata, attachmentBody);
+        attachmentEvent.setKogitoProcessId(processId);
+        attachmentEvent.setKogitoProcessInstanceId(processInstanceId);
+        attachmentEvent.setKogitoRootProcessId(rootProcessId);
+        attachmentEvent.setKogitoRootProcessInstanceId(rootProcessInstanceId);
+        return attachmentEvent;
+    }
 
-        return new UserTaskInstanceDataEvent(URI.create("http://localhost:8080/" + processId).toString(), null, null, body.metaData(), body);
+    private static String getEndpoint(String processId) {
+        return URI.create("http://localhost:8080/" + processId).toString();
     }
 
-    public static AttachmentEventBody getTaskAttachment(String id, String user, String name, String content) {
-        return AttachmentEventBody.create()
-                .id(id)
-                .updatedBy(user)
-                .name(name)
-                .content(content == null ? null : URI.create(content))
-                .updatedAt(new Date())
+    public static UserTaskInstanceAttachmentEventBody getTaskAttachment(String id, String user, String name, String content) {
+        return UserTaskInstanceAttachmentEventBody.create()
+                .attachmentId(id)
+                .eventUser(user)
+                .attachmentName(name)
+                .attachmentURI(content == null ? null : URI.create(content))
+                .eventDate(new Date())
                 .build();
     }
 
-    public static CommentEventBody getTaskComment(String id, String user, String comment) {
-        return CommentEventBody.create()
-                .id(id)
-                .content(comment)
-                .updatedBy(user)
-                .updatedAt(new Date())
+    public static UserTaskInstanceCommentEventBody getTaskComment(String id, String user, String comment) {
+        return UserTaskInstanceCommentEventBody.create()
+                .commentId(id)
+                .commentContent(comment)
+                .eventUser(user)
+                .eventDate(new Date())
                 .build();
     }
 
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
index 8f2a20e666..dc9a34cc71 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
@@ -1,24 +1,32 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.containers;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoGenericContainer;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -34,7 +42,7 @@ public abstract class AbstractDataIndexContainer extends KogitoGenericContainer<
     public AbstractDataIndexContainer(String containerName) {
         super(containerName);
         addExposedPort(PORT);
-        waitingFor(Wait.forListeningPort());
+        waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         addEnv("KOGITO_PROTOBUF_FOLDER", "/home/kogito/data/protobufs/");
         withAccessToHost(true);
     }
@@ -46,9 +54,20 @@ public void setKafkaURL(String kafkaURL) {
     public void addProtoFileFolder() {
         String pathStr = "target/classes/META-INF/resources/persistence/protobuf/";
         String absolutePath = new File(pathStr).getAbsolutePath();
+        createIfNotExists(absolutePath);
         withFileSystemBind(absolutePath, "/home/kogito/data/protobufs/", BindMode.READ_ONLY);
     }
 
+    public Path createIfNotExists(String absolutePath) {
+        Path path = Paths.get(absolutePath);
+        try {
+            Files.createDirectories(path);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return path;
+    }
+
     @Override
     public int getMappedPort() {
         return getMappedPort(PORT);
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInMemoryContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInMemoryContainer.java
index a1d11cb2ec..39c941700d 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInMemoryContainer.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInMemoryContainer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.containers;
 
 /**
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInfinispanContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInfinispanContainer.java
index 468e181040..85fdb5d4e6 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInfinispanContainer.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexInfinispanContainer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.containers;
 
 /**
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexMongoDBContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexMongoDBContainer.java
index 6e169dca9c..f29896c029 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexMongoDBContainer.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexMongoDBContainer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.containers;
 
 /**
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java
index 28435bc7f7..c6b7cc143a 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexOracleContainer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.containers;
 
 /**
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java
index 04d8efc586..c02aca8414 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.containers;
 
 /**
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/KogitoKafkaContainerWithoutBridge.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/KogitoKafkaContainerWithoutBridge.java
index c304c65ee4..a4daa3c0d7 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/KogitoKafkaContainerWithoutBridge.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/KogitoKafkaContainerWithoutBridge.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.test.containers;
 
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java
index 9bc75a8335..caf191899d 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus;
 
 import java.util.HashMap;
@@ -37,13 +39,12 @@ protected Map<String, String> getProperties() {
         properties.putAll(getTestResource().getProperties());
         properties.put("mp.messaging.outgoing.kogito-processinstances-events.connector", "quarkus-http");
         properties.put("mp.messaging.outgoing.kogito-processinstances-events.url", dataIndexUrl + "/processes");
+        properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.connector", "quarkus-http");
+        properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.url", dataIndexUrl + "/definitions");
         properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.connector", "quarkus-http");
         properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.url", dataIndexUrl + "/tasks");
-        properties.put("mp.messaging.outgoing.kogito-variables-events.connector", "quarkus-http");
-        properties.put("mp.messaging.outgoing.kogito-variables-events.url", dataIndexUrl);
         properties.put("mp.messaging.outgoing.kogito-jobs-events.connector", "quarkus-http");
         properties.put("mp.messaging.outgoing.kogito-jobs-events.url", dataIndexUrl + "/jobs");
-        properties.put("kogito.events.variables.enabled", "false");
         return properties;
     }
 
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryResource.java
index 1ce9387d4d..3c618adb31 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/KogitoServiceRandomPortTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/KogitoServiceRandomPortTestResource.java
index 77c03bd5dd..9db1435faf 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/KogitoServiceRandomPortTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/KogitoServiceRandomPortTestResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.test.quarkus;
 
@@ -34,7 +37,9 @@ public String getResourceName() {
 
     @Override
     public void start() {
-        httpPort = SocketUtils.findAvailablePort();
+        if (httpPort == 0) {
+            httpPort = SocketUtils.findAvailablePort();
+        }
         Testcontainers.exposeHostPorts(httpPort);
         //the hostname for the container to access the host is "host.testcontainers.internal"
         //https://www.testcontainers.org/features/networking/#exposing-host-ports-to-the-container
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java
index 100084dfa4..4a6200e007 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
@@ -41,13 +43,12 @@ protected Map<String, String> getDataIndexConnectionProperties() {
         properties.put(KOGITO_DATA_INDEX_SERVICE_URL, dataIndexUrl);
         properties.put("mp.messaging.outgoing.kogito-processinstances-events.connector", "quarkus-http");
         properties.put("mp.messaging.outgoing.kogito-processinstances-events.url", dataIndexUrl + "/processes");
+        properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.connector", "quarkus-http");
+        properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.url", dataIndexUrl + "/definitions");
         properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.connector", "quarkus-http");
         properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.url", dataIndexUrl + "/tasks");
-        properties.put("mp.messaging.outgoing.kogito-variables-events.connector", "quarkus-http");
-        properties.put("mp.messaging.outgoing.kogito-variables-events.url", dataIndexUrl);
         properties.put("mp.messaging.outgoing.kogito-jobs-events.connector", "quarkus-http");
         properties.put("mp.messaging.outgoing.kogito-jobs-events.url", dataIndexUrl + "/jobs");
-        properties.put("kogito.events.variables.enabled", "false");
         return properties;
     }
 
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpQuarkusTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpQuarkusTestResource.java
index f7955a3b33..b016686f00 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpQuarkusTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpQuarkusTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpResource.java
index df98d8a12b..2d47759494 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexInfinispanHttpResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpQuarkusTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpQuarkusTestResource.java
index 9aa30d4775..e3fc904dcc 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpQuarkusTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpQuarkusTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpResource.java
index 9b01354a9d..699e50d006 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexMongoDBHttpResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java
index 6d91bf6fd4..e72a31e8e8 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpQuarkusTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java
index af3e077a2c..fc8f666f14 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexOracleHttpResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpQuarkusTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpQuarkusTestResource.java
index 032ad61b86..af75fdb60b 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpQuarkusTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpQuarkusTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java
index aa744f387f..a0483a101a 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/DataIndexPostgreSqlHttpResource.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.http;
 
 import org.kie.kogito.index.test.containers.DataIndexPostgreSqlContainer;
 import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +45,7 @@ public void start() {
         Network network = Network.newNetwork();
         postgresql.withNetwork(network);
         postgresql.withNetworkAliases("postgresql");
-        postgresql.waitingFor(Wait.forListeningPort());
+        postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         postgresql.start();
 
         dataIndex.addProtoFileFolder();
diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java
similarity index 52%
rename from apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java
rename to data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java
index 2902585f90..b8f76f8435 100644
--- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java
@@ -1,19 +1,22 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-package org.kie.kogito.index.quarkus.http;
+package org.kie.kogito.index.test.quarkus.http;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,6 +29,7 @@
 public class KogitoServiceRandomPortQuarkusHttpTestResource extends ConditionalQuarkusTestResource {
 
     public static final String QUARKUS_SERVICE_HTTP_PORT = "quarkus.http.port";
+    public static final String QUARKUS_SERVICE_HTTP_TEST_PORT = "quarkus.http.test-port";
 
     public KogitoServiceRandomPortQuarkusHttpTestResource() {
         super(new KogitoServiceRandomPortTestResource());
@@ -43,8 +47,10 @@ public int order() {
     protected Map<String, String> getProperties() {
         Map<String, String> properties = new HashMap<>();
         System.setProperty(QUARKUS_SERVICE_HTTP_PORT, String.valueOf(getTestResource().getMappedPort()));
+        System.setProperty(QUARKUS_SERVICE_HTTP_TEST_PORT, String.valueOf(getTestResource().getMappedPort()));
 
         properties.put(QUARKUS_SERVICE_HTTP_PORT, String.valueOf(getTestResource().getMappedPort()));
+        properties.put(QUARKUS_SERVICE_HTTP_TEST_PORT, String.valueOf(getTestResource().getMappedPort()));
         properties.put(KOGITO_SERVICE_URL, "http://host.testcontainers.internal:" + getTestResource().getMappedPort());
         return properties;
     }
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanKafkaResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanKafkaResource.java
index 7dce8d199c..4ae5430e22 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanKafkaResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanKafkaResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanQuarkusKafkaTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanQuarkusKafkaTestResource.java
index 1f0aea80b1..f511e0cf63 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanQuarkusKafkaTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexInfinispanQuarkusKafkaTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBKafkaResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBKafkaResource.java
index 3099861601..694b3b371c 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBKafkaResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBKafkaResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBQuarkusKafkaTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBQuarkusKafkaTestResource.java
index bfd0491512..b206d167b5 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBQuarkusKafkaTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexMongoDBQuarkusKafkaTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java
index 78ce2f9673..968ad34f5e 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleKafkaResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
@@ -22,6 +24,7 @@
 import org.kie.kogito.index.test.containers.DataIndexOracleContainer;
 import org.kie.kogito.index.test.containers.KogitoKafkaContainerWithoutBridge;
 import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoOracleSqlContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,7 +57,7 @@ public void start() {
         oracle.start();
         kafka.withNetwork(network);
         kafka.withNetworkAliases("kafka");
-        kafka.waitingFor(Wait.forListeningPort());
+        kafka.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         kafka.start();
         String kafkaURL = kafka.getBootstrapServers();
         properties.put("kafka.bootstrap.servers", kafkaURL);
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java
index 08b08b53c6..1466378146 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexOracleQuarkusKafkaTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java
index a436135a59..cf9caf6d82 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlKafkaResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
@@ -22,6 +24,7 @@
 import org.kie.kogito.index.test.containers.DataIndexPostgreSqlContainer;
 import org.kie.kogito.index.test.containers.KogitoKafkaContainerWithoutBridge;
 import org.kie.kogito.test.resources.TestResource;
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,11 +52,11 @@ public void start() {
         Network network = Network.newNetwork();
         postgresql.withNetwork(network);
         postgresql.withNetworkAliases("postgresql");
-        postgresql.waitingFor(Wait.forListeningPort());
+        postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         postgresql.start();
         kafka.withNetwork(network);
         kafka.withNetworkAliases("kafka");
-        kafka.waitingFor(Wait.forListeningPort());
+        kafka.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         kafka.start();
         String kafkaURL = kafka.getBootstrapServers();
         properties.put("kafka.bootstrap.servers", kafkaURL);
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlQuarkusKafkaTestResource.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlQuarkusKafkaTestResource.java
index 1a3c810a01..b61cf69880 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlQuarkusKafkaTestResource.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/kafka/DataIndexPostgreSqlQuarkusKafkaTestResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.test.quarkus.kafka;
 
 import java.util.HashMap;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml
index 9c0b57c0de..f4b04fc603 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
@@ -30,5 +50,13 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-addons-quarkus-source-files-deployment</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-oidc-deployment</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/AbstractKogitoAddonsQuarkusDataIndexPersistenceProcessor.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/AbstractKogitoAddonsQuarkusDataIndexPersistenceProcessor.java
index 1e517cb461..f37f3ffa58 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/AbstractKogitoAddonsQuarkusDataIndexPersistenceProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/AbstractKogitoAddonsQuarkusDataIndexPersistenceProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.persistence.deployment;
 
 import org.jboss.jandex.DotName;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml
index 1d22996002..68ad6cfd20 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml
index fab7cdcf23..2adca65f55 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -27,6 +47,10 @@
             <groupId>org.kie.kogito</groupId>
             <artifactId>kogito-addons-quarkus-source-files</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.kie.kogito</groupId>
             <artifactId>jbpm-flow</artifactId>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
index ebf34ecdbe..d8bcd1509d 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.addon;
 
 import java.io.IOException;
@@ -26,15 +28,15 @@
 
 import org.kie.kogito.event.DataEvent;
 import org.kie.kogito.event.EventPublisher;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
-import org.kie.kogito.index.event.ProcessInstanceEventMapper;
-import org.kie.kogito.index.event.UserTaskInstanceEventMapper;
+import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.service.IndexingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.kie.kogito.event.process.ProcessDefinitionDataEvent.PROCESS_DEFINITION_EVENT;
 import static org.kie.kogito.index.json.JsonUtils.getObjectMapper;
 
 @ApplicationScoped
@@ -50,15 +52,29 @@ public class DataIndexEventPublisher implements EventPublisher {
     public void publish(DataEvent<?> event) {
         LOGGER.debug("Sending event to embedded data index: {}", event);
         switch (event.getType()) {
-            case "ProcessInstanceEvent":
-                indexingService.indexProcessInstance(new ProcessInstanceEventMapper().apply((ProcessInstanceDataEvent) event));
+            case PROCESS_DEFINITION_EVENT:
+                indexingService.indexProcessDefinition((ProcessDefinitionDataEvent) event);
+                break;
+            case "ProcessInstanceErrorDataEvent":
+            case "ProcessInstanceNodeDataEvent":
+            case "ProcessInstanceSLADataEvent":
+            case "ProcessInstanceStateDataEvent":
+            case "ProcessInstanceVariableDataEvent":
+                indexingService.indexProcessInstanceEvent((ProcessInstanceDataEvent<?>) event);
                 break;
-            case "UserTaskInstanceEvent":
-                indexingService.indexUserTaskInstance(new UserTaskInstanceEventMapper().apply((UserTaskInstanceDataEvent) event));
+            case "UserTaskInstanceAssignmentDataEvent":
+            case "UserTaskInstanceAttachmentDataEvent":
+            case "UserTaskInstanceCommentDataEvent":
+            case "UserTaskInstanceDeadlineDataEvent":
+            case "UserTaskInstanceStateDataEvent":
+            case "UserTaskInstanceVariableDataEvent":
+                indexingService.indexUserTaskInstanceEvent((UserTaskInstanceDataEvent<?>) event);
                 break;
             case "JobEvent":
                 try {
-                    indexingService.indexJob(getObjectMapper().readValue(new String((byte[]) event.getData()), Job.class));
+                    Job job = getObjectMapper().readValue(new String((byte[]) event.getData()), Job.class);
+                    job.setEndpoint(event.getSource() == null ? null : event.getSource().toString());
+                    indexingService.indexJob(job);
                 } catch (IOException e) {
                     throw new UncheckedIOException(e);
                 }
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java
deleted file mode 100644
index 1cf53ee080..0000000000
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.kie.kogito.index.addon;
-
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Instance;
-
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.kie.kogito.Application;
-import org.kie.kogito.index.api.KogitoRuntimeClient;
-import org.kie.kogito.index.model.ProcessDefinition;
-import org.kie.kogito.index.service.DataIndexServiceException;
-import org.kie.kogito.index.storage.DataIndexStorageService;
-import org.kie.kogito.process.Process;
-import org.kie.kogito.process.Processes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.quarkus.runtime.StartupEvent;
-
-import static java.lang.String.format;
-
-@ApplicationScoped
-public class ProcessDefinitionRegister {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProcessDefinitionRegister.class);
-
-    @ConfigProperty(name = "kogito.service.url")
-    Optional<String> kogitoServiceUrl;
-
-    void startup(@Observes StartupEvent event, Instance<Processes> processesInstance, Application app, DataIndexStorageService storage, KogitoRuntimeClient client) {
-        if (processesInstance.isResolvable()) {
-            Processes processes = processesInstance.get();
-            processes.processIds().stream()
-                    .map(processes::processById)
-                    .map(mapProcessDefinition(app.config().addons().availableAddons(), kogitoServiceUrl.orElse(null), client))
-                    .forEach(process -> {
-                        LOGGER.debug("Registering process definition with id: {}", process.getId());
-                        storage.getProcessDefinitionsCache().put(process.getKey(), process);
-                    });
-        } else {
-            LOGGER.info("No process definitions to register.");
-        }
-    }
-
-    private Function<Process<?>, ProcessDefinition> mapProcessDefinition(Set<String> addons, String endpoint, KogitoRuntimeClient client) {
-        return p -> {
-            ProcessDefinition pd = new ProcessDefinition();
-            pd.setId(p.id());
-            pd.setName(p.name());
-            pd.setVersion(p.version());
-            pd.setType(pd.getType());
-            pd.setAddons(addons);
-            // See ProcessInstanceEventBatch.buildSource
-            pd.setEndpoint(endpoint + "/" + (p.id().contains(".") ? p.id().substring(p.id().lastIndexOf('.') + 1) : p.id()));
-            try {
-                String content = client.getProcessDefinitionSourceFileContent(null, p.id()).get();
-                pd.setSource(content);
-            } catch (InterruptedException e) {
-                LOGGER.warn("Interrupted thread while registering process definition with id: {}", p.id(), e);
-                Thread.currentThread().interrupt();
-            } catch (Exception e) {
-                throw new DataIndexServiceException(format("Failed to register process definition with id: %s", p.id()), e);
-            }
-            try {
-                pd.setNodes(client.getProcessDefinitionNodes(null, p.id()).get());
-            } catch (InterruptedException e) {
-                LOGGER.warn("Interrupted thread while registering process definition with id: {}", p.id(), e);
-                Thread.currentThread().interrupt();
-            } catch (Exception e) {
-                throw new DataIndexServiceException(format("Failed to register process definition with id: %s", p.id()), e);
-            }
-            return pd;
-        };
-    }
-
-}
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
index 654b577cdb..4ac132c3d0 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.addon.api;
 
 import java.io.IOException;
@@ -33,7 +35,7 @@
 import org.kie.kogito.Application;
 import org.kie.kogito.addon.source.files.SourceFilesProvider;
 import org.kie.kogito.index.api.KogitoRuntimeClient;
-import org.kie.kogito.index.model.Job;
+import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
 import org.kie.kogito.index.model.Node;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.model.UserTaskInstance;
@@ -49,7 +51,7 @@
 import static java.util.stream.Collectors.toMap;
 
 @ApplicationScoped
-public class KogitoAddonRuntimeClientImpl implements KogitoRuntimeClient {
+public class KogitoAddonRuntimeClientImpl extends KogitoRuntimeCommonClient implements KogitoRuntimeClient {
 
     private static String SUCCESSFULLY_OPERATION_MESSAGE = "Successfully performed: %s";
 
@@ -212,14 +214,6 @@ public CompletableFuture<String> cancelNodeInstance(String serviceURL, ProcessIn
         }));
     }
 
-    public CompletableFuture<String> cancelJob(String serviceURL, Job job) {
-        return throwUnsupportedException();
-    }
-
-    public CompletableFuture<String> rescheduleJob(String serviceURL, Job job, String newJobData) throws UncheckedIOException {
-        return throwUnsupportedException();
-    }
-
     @Override
     public CompletableFuture<String> getUserTaskSchema(String serviceURL, UserTaskInstance userTaskInstance, String user, List<String> groups) {
         return throwUnsupportedException();
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/resources/META-INF/beans.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/resources/META-INF/beans.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherTest.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherTest.java
index bbe9867547..731ee24cae 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherTest.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.addon;
 
 import java.io.UncheckedIOException;
@@ -24,9 +26,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.event.AbstractDataEvent;
 import org.kie.kogito.event.DataEvent;
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
 import org.kie.kogito.index.model.Job;
-import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.service.IndexingService;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
@@ -70,13 +71,14 @@ public void setup() {
 
     @Test
     void onProcessInstanceEvent() {
-        ArgumentCaptor<ProcessInstance> eventCaptor = ArgumentCaptor.forClass(ProcessInstance.class);
-        ProcessInstanceDataEvent event = getProcessCloudEvent(PROCESS_ID, PROCESS_INSTANCE_ID, COMPLETED,
+
+        ArgumentCaptor<ProcessInstanceStateDataEvent> eventCaptor = ArgumentCaptor.forClass(ProcessInstanceStateDataEvent.class);
+        ProcessInstanceStateDataEvent event = getProcessCloudEvent(PROCESS_ID, PROCESS_INSTANCE_ID, COMPLETED,
                 ROOT_PROCESS_INSTANCE_ID, ROOT_PROCESS_ID, ROOT_PROCESS_INSTANCE_ID, "currentUser");
 
         dataIndexEventPublisher.publish(event);
 
-        verify(indexingService).indexProcessInstance(eventCaptor.capture());
+        verify(indexingService).indexProcessInstanceEvent(eventCaptor.capture());
     }
 
     @Test
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
index d041cc37ea..e1c56069ae 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
@@ -1,20 +1,24 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.addon.api;
 
+import java.nio.Buffer;
 import java.util.Optional;
 
 import javax.enterprise.inject.Instance;
@@ -24,6 +28,8 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.Application;
 import org.kie.kogito.addon.source.files.SourceFilesProvider;
+import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
+import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.kie.kogito.index.test.TestUtils;
 import org.kie.kogito.process.ProcessError;
@@ -34,10 +40,24 @@
 import org.kie.kogito.services.uow.CollectingUnitOfWorkFactory;
 import org.kie.kogito.services.uow.DefaultUnitOfWorkManager;
 import org.kie.kogito.svg.ProcessSvgService;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import io.quarkus.security.credential.TokenCredential;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.client.HttpRequest;
+import io.vertx.ext.web.client.HttpResponse;
+import io.vertx.ext.web.client.WebClient;
+import io.vertx.ext.web.client.WebClientOptions;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
@@ -50,6 +70,21 @@ public class KogitoAddonRuntimeClientImplTest {
     private static final String NODE_ID = "nodeId";
     private static String TASK_ID = "taskId";
     private static String JOB_ID = "jobId";
+    private static String AUTHORIZED_TOKEN = "authToken";
+
+    @Mock
+    public Vertx vertx;
+
+    @Mock
+    private SecurityIdentity identityMock;
+
+    private TokenCredential tokenCredential;
+
+    @Mock
+    private WebClient webClientMock;
+
+    @Mock
+    private HttpRequest httpRequestMock;
 
     public static final String NODE_ID_ERROR = "processInstanceIdError";
 
@@ -111,6 +146,10 @@ public void setup() {
         lenient().when(applicationInstance.get()).thenReturn(application);
 
         client = spy(new KogitoAddonRuntimeClientImpl(processSvgServiceInstance, sourceFilesProvider, processesInstance, applicationInstance));
+        client.setGatewayTargetUrl(Optional.empty());
+        client.addServiceWebClient(SERVICE_URL, webClientMock);
+        client.setVertx(vertx);
+        client.setIdentity(identityMock);
     }
 
     private org.kie.kogito.process.ProcessInstance mockProcessInstanceStatusActive() {
@@ -200,8 +239,137 @@ void testCancelNodeInstance() {
         verify(processInstance, times(1)).cancelNodeInstance(NODE_ID);
     }
 
+    @Test
+    protected void testCancelJobRest() {
+        setupIdentityMock();
+        when(webClientMock.delete(anyString())).thenReturn(httpRequestMock);
+        Job job = createJob(JOB_ID, PROCESS_INSTANCE_ID, "SCHEDULED");
+        client.cancelJob(SERVICE_URL, job);
+
+        verify(client).sendDeleteClientRequest(webClientMock,
+                format(KogitoRuntimeCommonClient.CANCEL_JOB_PATH, job.getId()),
+                "CANCEL Job with id: " + JOB_ID);
+        ArgumentCaptor<Handler> handlerCaptor = ArgumentCaptor.forClass(Handler.class);
+        verify(httpRequestMock).send(handlerCaptor.capture());
+        checkResponseHandling(handlerCaptor.getValue());
+    }
+
+    @Test
+    protected void testRescheduleWithoutJobServiceInstance() {
+        String newJobData = "{\"expirationTime\": \"2023-08-27T04:35:54.631Z\",\"retries\": 2}";
+        setupIdentityMock();
+        when(webClientMock.patch(anyString())).thenReturn(httpRequestMock);
+
+        Job job = createJob(JOB_ID, PROCESS_INSTANCE_ID, "SCHEDULED");
+
+        client.rescheduleJob(SERVICE_URL, job, newJobData);
+        ArgumentCaptor<JsonObject> jsonCaptor = ArgumentCaptor.forClass(JsonObject.class);
+
+        verify(client).sendPatchClientRequest(eq(webClientMock),
+                eq(format(KogitoRuntimeCommonClient.RESCHEDULE_JOB_PATH, JOB_ID)),
+                eq("RESCHEDULED JOB with id: " + job.getId()),
+                jsonCaptor.capture());
+
+        assertThat(jsonCaptor.getValue().getString("expirationTime")).isEqualTo("2023-08-27T04:35:54.631Z");
+        assertThat(jsonCaptor.getValue().getString("retries")).isEqualTo("2");
+
+        ArgumentCaptor<Handler> handlerCaptor = ArgumentCaptor.forClass(Handler.class);
+        JsonObject jsonOject = new JsonObject(newJobData);
+        verify(httpRequestMock).sendJson(eq(jsonOject), handlerCaptor.capture());
+        verify(httpRequestMock).putHeader("Authorization", "Bearer " + AUTHORIZED_TOKEN);
+        checkResponseHandling(handlerCaptor.getValue());
+    }
+
+    @Test
+    public void testWebClientToURLOptions() {
+        String defaultHost = "localhost";
+        int defaultPort = 8180;
+        WebClientOptions webClientOptions = client.getWebClientToURLOptions("http://" + defaultHost + ":" + defaultPort);
+        assertThat(webClientOptions.getDefaultHost()).isEqualTo(defaultHost);
+        assertThat(webClientOptions.getDefaultPort()).isEqualTo(defaultPort);
+    }
+
+    @Test
+    public void testWebClientToURLOptionsWithoutPort() {
+        String dataIndexUrl = "http://service.com";
+        WebClientOptions webClientOptions = client.getWebClientToURLOptions(dataIndexUrl);
+        assertThat(webClientOptions.getDefaultPort()).isEqualTo(80);
+        assertThat(webClientOptions.getDefaultHost()).isEqualTo("service.com");
+        assertFalse(webClientOptions.isSsl());
+    }
+
+    @Test
+    public void testWebClientToURLOptionsWithoutPortSSL() {
+        String dataIndexurl = "https://service.com";
+        WebClientOptions webClientOptions = client.getWebClientToURLOptions(dataIndexurl);
+        assertThat(webClientOptions.getDefaultPort()).isEqualTo(443);
+        assertThat(webClientOptions.getDefaultHost()).isEqualTo("service.com");
+        assertTrue(webClientOptions.isSsl());
+    }
+
+    @Test
+    public void testMalformedURL() {
+        assertThat(client.getWebClientToURLOptions("malformedURL")).isNull();
+    }
+
+    @Test
+    void testOverrideURL() {
+        String host = "host.testcontainers.internal";
+        client.setGatewayTargetUrl(Optional.of(host));
+        WebClientOptions webClientOptions = client.getWebClientToURLOptions("http://service.com");
+        assertThat(webClientOptions.getDefaultHost()).isEqualTo(host);
+    }
+
+    @Test
+    public void testGetAuthHeader() {
+        tokenCredential = mock(TokenCredential.class);
+        when(identityMock.getCredential(TokenCredential.class)).thenReturn(tokenCredential);
+        when(tokenCredential.getToken()).thenReturn(AUTHORIZED_TOKEN);
+
+        String token = client.getAuthHeader();
+        verify(identityMock, times(2)).getCredential(TokenCredential.class);
+        assertThat(token).isEqualTo("Bearer " + AUTHORIZED_TOKEN);
+
+        when(identityMock.getCredential(TokenCredential.class)).thenReturn(null);
+        token = client.getAuthHeader();
+        assertThat(token).isEqualTo("");
+    }
+
     private ProcessInstance createProcessInstance(String processInstanceId, int status) {
         return TestUtils.getProcessInstance("travels", processInstanceId, status, null, null);
     }
 
+    private Job createJob(String jobId, String processInstanceId, String status) {
+        return TestUtils.getJob(jobId, "travels", processInstanceId, null, null, status);
+    }
+
+    private AsyncResult createResponseMocks(HttpResponse response, boolean succeed, int statusCode) {
+        AsyncResult asyncResultMock = mock(AsyncResult.class);
+        when(asyncResultMock.succeeded()).thenReturn(succeed);
+        when(asyncResultMock.result()).thenReturn(response);
+        when(response.statusCode()).thenReturn(statusCode);
+        return asyncResultMock;
+    }
+
+    protected void checkResponseHandling(Handler<AsyncResult<HttpResponse<Buffer>>> handler) {
+        HttpResponse response = mock(HttpResponse.class);
+        HttpResponse responseWithoutError = mock(HttpResponse.class);
+
+        handler.handle(createResponseMocks(response, false, 404));
+        verify(response).statusMessage();
+        verify(response).body();
+        verify(response, never()).bodyAsString();
+
+        handler.handle(createResponseMocks(responseWithoutError, true, 200));
+        verify(responseWithoutError, never()).statusMessage();
+        verify(responseWithoutError, never()).body();
+        verify(responseWithoutError).bodyAsString();
+    }
+
+    protected void setupIdentityMock() {
+        tokenCredential = mock(TokenCredential.class);
+        when(identityMock.getCredential(TokenCredential.class)).thenReturn(tokenCredential);
+        when(tokenCredential.getToken()).thenReturn(AUTHORIZED_TOKEN);
+        when(httpRequestMock.putHeader(eq("Authorization"), eq("Bearer " + AUTHORIZED_TOKEN))).thenReturn(httpRequestMock);
+    }
 }
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml
index 0a5f17e8f4..57c5d839a8 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/InfinispanDataIndexPersistenceProcessor.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/InfinispanDataIndexPersistenceProcessor.java
index f9b1dec732..1a0225d6eb 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/InfinispanDataIndexPersistenceProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/InfinispanDataIndexPersistenceProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.persistence.deployment;
 
 import io.quarkus.deployment.annotations.BuildProducer;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml
index 038db2c370..0e8ba6363e 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/main/resources/application.properties
index e43686884a..e261bcff15 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/main/resources/application.properties
@@ -1,5 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=infinispan
 kogito.service.url=http://localhost:8080
 
 quarkus.devservices.enabled=false
-quarkus.infinispan-client.use-auth=false
\ No newline at end of file
+quarkus.infinispan-client.use-auth=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java
index c9d7827f4c..e085a08b21 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.test.quarkus.http.DataIndexInfinispanHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
 import io.quarkus.test.common.QuarkusTestResource;
@@ -36,6 +39,7 @@
 
 @QuarkusIntegrationTest
 @QuarkusTestResource(DataIndexInfinispanHttpQuarkusTestResource.class)
+@QuarkusTestResource(value = KogitoServiceRandomPortQuarkusHttpTestResource.class)
 class InfinispanQuarkusAddonDataIndexPersistenceIT {
 
     static {
@@ -55,7 +59,7 @@ void testDataIndexAddon() {
                 .body("data.ProcessDefinitions[0].id", is("hello"))
                 .body("data.ProcessDefinitions[0].name", is("hello"))
                 .body("data.ProcessDefinitions[0].version", is("1.0"))
-                .body("data.ProcessDefinitions[0].endpoint", is("http://localhost:8080/hello"))
+                .body("data.ProcessDefinitions[0].endpoint", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].addons", hasItem("infinispan-persistence"))
                 .body("data.ProcessDefinitions[0].source", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].nodes.size()", is(2))
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml
index 78252951cb..60d8a67587 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/main/resources/application.properties
index e43686884a..e261bcff15 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/main/resources/application.properties
@@ -1,5 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=infinispan
 kogito.service.url=http://localhost:8080
 
 quarkus.devservices.enabled=false
-quarkus.infinispan-client.use-auth=false
\ No newline at end of file
+quarkus.infinispan-client.use-auth=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java
index 272cdf8a88..7d18859b37 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexPersistenceIT.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.test.quarkus.http.DataIndexInfinispanHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
 import io.quarkus.test.common.QuarkusTestResource;
@@ -37,6 +40,7 @@
 
 @QuarkusIntegrationTest
 @QuarkusTestResource(DataIndexInfinispanHttpQuarkusTestResource.class)
+@QuarkusTestResource(value = KogitoServiceRandomPortQuarkusHttpTestResource.class)
 class InfinispanQuarkusAddonDataIndexPersistenceIT {
 
     static {
@@ -56,7 +60,7 @@ void testDataIndexAddon() {
                 .body("data.ProcessDefinitions[0].id", is("greet"))
                 .body("data.ProcessDefinitions[0].name", is("Greeting workflow"))
                 .body("data.ProcessDefinitions[0].version", is("1.0"))
-                .body("data.ProcessDefinitions[0].endpoint", is("http://localhost:8080/greet"))
+                .body("data.ProcessDefinitions[0].endpoint", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].addons", hasItem("infinispan-persistence"))
                 .body("data.ProcessDefinitions[0].source", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].nodes.size()", is(12))
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml
index 449f50d00c..b30f334c50 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml
index 423eec8f86..2015f5933e 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/hotrod-client.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/hotrod-client.properties
index ed23c02c1a..03bfa85f8f 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/hotrod-client.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/hotrod-client.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Docker 4 Mac workaround
 # infinispan.client.hotrod.client_intelligence=BASIC
 
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index e647d5855d..f128cd3d65 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Addons Quarkus Data Index Persistence Infinispan
 description: Kogito Data Index Persistence Infinispan Add-On
 metadata:
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/application.properties
index 75cf6d17dc..6db7c08ae0 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.qute.property-not-found-strategy=default
 quarkus.qute.strict-rendering=false
 
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/templates/kogito-cache-default.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/templates/kogito-cache-default.xml
index 3d69eb35d8..8fea9fc6db 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/templates/kogito-cache-default.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/src/main/resources/templates/kogito-cache-default.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <infinispan>
   <cache-container shutdown-hook="DEFAULT">
     {#let template=config:property('kogito.cache.domain.template')}
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml
index 0575370af4..c8b66d8791 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/MongoDataIndexPersistenceProcessor.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/MongoDataIndexPersistenceProcessor.java
index 8a152d857f..23cf37e6b1 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/MongoDataIndexPersistenceProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/MongoDataIndexPersistenceProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.persistence.deployment;
 
 import org.kie.kogito.index.mongodb.model.ProcessDefinitionEntity;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml
index 9deb641f74..89dc1c37f6 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/main/resources/application.properties
index ebf86e7b1f..34d50644cf 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/main/resources/application.properties
@@ -1,7 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=mongodb
 kogito.service.url=http://localhost:8080
 
 # MongoDB
 quarkus.mongodb.database=kogito
 
-quarkus.devservices.enabled=false
\ No newline at end of file
+quarkus.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java
index 2b6bf13a05..cd1e5bad7b 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.test.quarkus.http.DataIndexMongoDBHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
 import io.quarkus.test.common.QuarkusTestResource;
@@ -36,6 +39,7 @@
 
 @QuarkusIntegrationTest
 @QuarkusTestResource(DataIndexMongoDBHttpQuarkusTestResource.class)
+@QuarkusTestResource(value = KogitoServiceRandomPortQuarkusHttpTestResource.class)
 class MongoQuarkusAddonDataIndexPersistenceIT {
 
     static {
@@ -55,7 +59,7 @@ void testDataIndexAddon() {
                 .body("data.ProcessDefinitions[0].id", is("hello"))
                 .body("data.ProcessDefinitions[0].name", is("hello"))
                 .body("data.ProcessDefinitions[0].version", is("1.0"))
-                .body("data.ProcessDefinitions[0].endpoint", is("http://localhost:8080/hello"))
+                .body("data.ProcessDefinitions[0].endpoint", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].addons", hasItem("mongodb-persistence"))
                 .body("data.ProcessDefinitions[0].source", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].nodes.size()", is(2))
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml
index 9b3490d5fb..217920aec8 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/main/resources/application.properties
index ebf86e7b1f..34d50644cf 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/main/resources/application.properties
@@ -1,7 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=mongodb
 kogito.service.url=http://localhost:8080
 
 # MongoDB
 quarkus.mongodb.database=kogito
 
-quarkus.devservices.enabled=false
\ No newline at end of file
+quarkus.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java
index 9f5e043543..12c95e8117 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexPersistenceIT.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.test.quarkus.http.DataIndexMongoDBHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
 import io.quarkus.test.common.QuarkusTestResource;
@@ -37,6 +40,7 @@
 
 @QuarkusIntegrationTest
 @QuarkusTestResource(DataIndexMongoDBHttpQuarkusTestResource.class)
+@QuarkusTestResource(value = KogitoServiceRandomPortQuarkusHttpTestResource.class)
 class MongoQuarkusAddonDataIndexPersistenceIT {
 
     static {
@@ -56,7 +60,7 @@ void testDataIndexAddon() {
                 .body("data.ProcessDefinitions[0].id", is("greet"))
                 .body("data.ProcessDefinitions[0].name", is("Greeting workflow"))
                 .body("data.ProcessDefinitions[0].version", is("1.0"))
-                .body("data.ProcessDefinitions[0].endpoint", is("http://localhost:8080/greet"))
+                .body("data.ProcessDefinitions[0].endpoint", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].addons", hasItem("mongodb-persistence"))
                 .body("data.ProcessDefinitions[0].source", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].nodes.size()", is(12))
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml
index b9299577f4..dcb7893898 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml
index 56f0defaf7..248216ef87 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 6fa0a2e1e2..4889d304d8 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Addons Quarkus Data Index Persistence MongoDB
 description: Kogito Data Index Persistence MongoDB Add-On
 metadata:
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/application.properties
index 8eb5c97876..bc7ef3e84d 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/src/main/resources/application.properties
@@ -1,2 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=mongodb
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml
index a735b0d8a8..3cb55ca2a0 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/PostgreSQLDataIndexPersistenceProcessor.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/PostgreSQLDataIndexPersistenceProcessor.java
index f59a2d5479..4dc33512e9 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/PostgreSQLDataIndexPersistenceProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/persistence/deployment/PostgreSQLDataIndexPersistenceProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.persistence.deployment;
 
 import io.quarkus.deployment.annotations.BuildProducer;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml
index 591a82fd16..3de0726e4e 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/main/resources/application.properties
index 8e8e2ecf39..0041b31ee4 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/main/resources/application.properties
@@ -1,9 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=jdbc
-kogito.service.url=http://localhost:8080
+kogito.service.url=http://localhost:${quarkus.http.port}
 
 quarkus.flyway.migrate-at-start=true
 quarkus.flyway.baseline-on-migrate=true
 
 quarkus.datasource.db-kind=postgresql
 
-quarkus.devservices.enabled=false
\ No newline at end of file
+quarkus.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
index c8af346d97..f45b83f670 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.test.quarkus.http.DataIndexPostgreSqlHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
 import io.quarkus.test.common.QuarkusTestResource;
@@ -38,6 +41,7 @@
 
 @QuarkusIntegrationTest
 @QuarkusTestResource(value = DataIndexPostgreSqlHttpQuarkusTestResource.class, initArgs = { @ResourceArg(name = DATA_INDEX_MIGRATE_DB, value = "false") })
+@QuarkusTestResource(value = KogitoServiceRandomPortQuarkusHttpTestResource.class)
 class PostgreSQLQuarkusAddonDataIndexPersistenceIT {
 
     static {
@@ -49,15 +53,17 @@ class PostgreSQLQuarkusAddonDataIndexPersistenceIT {
 
     @Test
     void testDataIndexAddon() {
+        String processDefId = "hello";
         given().contentType(ContentType.JSON)
                 .baseUri(dataIndex)
-                .body("{ \"query\" : \"{ ProcessDefinitions{ id, name, version, endpoint, addons, source, nodes { id, name, type, uniqueId, metadata { UniqueId } } } }\" }")
+                .body("{ \"query\" : \"{ ProcessDefinitions (where: { id: {equal: \\\"" + processDefId
+                        + "\\\"}}){ id, name, version, endpoint, addons, source, nodes { id, name, type, uniqueId, metadata { UniqueId } } } }\" }")
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.ProcessDefinitions[0].id", is("hello"))
                 .body("data.ProcessDefinitions[0].name", is("hello"))
                 .body("data.ProcessDefinitions[0].version", is("1.0"))
-                .body("data.ProcessDefinitions[0].endpoint", is("http://localhost:8080/hello"))
+                .body("data.ProcessDefinitions[0].endpoint", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].addons", hasItem("jdbc-persistence"))
                 .body("data.ProcessDefinitions[0].source", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].nodes.size()", is(2))
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml
index 754362298d..f35da27607 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
@@ -31,6 +51,10 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-addons-quarkus-persistence-jdbc</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-addons-quarkus-source-files</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-agroal</artifactId>
@@ -44,6 +68,10 @@
       <artifactId>data-index-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-test-utils</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/main/resources/application.properties
index 8e8e2ecf39..b1ee569ad1 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=jdbc
 kogito.service.url=http://localhost:8080
 
@@ -6,4 +25,9 @@ quarkus.flyway.baseline-on-migrate=true
 
 quarkus.datasource.db-kind=postgresql
 
-quarkus.devservices.enabled=false
\ No newline at end of file
+quarkus.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
index 41fda510ca..c0857d9510 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
@@ -1,28 +1,31 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.index.test.quarkus.http.DataIndexPostgreSqlHttpQuarkusTestResource;
+import org.kie.kogito.index.test.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.ResourceArg;
-import io.quarkus.test.junit.QuarkusIntegrationTest;
+import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.path.json.JsonPath;
@@ -37,8 +40,9 @@
 import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 import static org.kie.kogito.index.test.quarkus.http.DataIndexPostgreSqlHttpQuarkusTestResource.DATA_INDEX_MIGRATE_DB;
 
-@QuarkusIntegrationTest
+@QuarkusTest
 @QuarkusTestResource(value = DataIndexPostgreSqlHttpQuarkusTestResource.class, initArgs = { @ResourceArg(name = DATA_INDEX_MIGRATE_DB, value = "false") })
+@QuarkusTestResource(value = KogitoServiceRandomPortQuarkusHttpTestResource.class)
 class PostgreSQLQuarkusAddonDataIndexPersistenceIT {
 
     static {
@@ -50,15 +54,19 @@ class PostgreSQLQuarkusAddonDataIndexPersistenceIT {
 
     @Test
     void testDataIndexAddon() {
+        Integer port = RestAssured.port;
+
+        String processDefId = "greet";
         String source = given().contentType(ContentType.JSON)
                 .baseUri(dataIndex)
-                .body("{ \"query\" : \"{ ProcessDefinitions{ id, name, version, endpoint, addons, source, nodes { id, name, type, uniqueId, metadata { UniqueId } } } }\" }")
+                .body("{ \"query\" : \"{ ProcessDefinitions(where: { id: {equal: \\\"" + processDefId
+                        + "\\\"}}){ id, name, version, endpoint, addons, source, nodes { id, name, type, uniqueId, metadata { UniqueId } } } }\" }")
                 .when().post("/graphql")
                 .then().log().ifValidationFails().statusCode(200)
                 .body("data.ProcessDefinitions[0].id", is("greet"))
                 .body("data.ProcessDefinitions[0].name", is("Greeting workflow"))
                 .body("data.ProcessDefinitions[0].version", is("1.0"))
-                .body("data.ProcessDefinitions[0].endpoint", is("http://localhost:8080/greet"))
+                .body("data.ProcessDefinitions[0].endpoint", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].addons", hasItem("jdbc-persistence"))
                 .body("data.ProcessDefinitions[0].source", is(not(emptyOrNullString())))
                 .body("data.ProcessDefinitions[0].nodes.size()", is(12))
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml
index ad03ba3520..6c5e8a3b79 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml
index d8a4799960..7e495b4f6f 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index e587f845dd..bcdc2b21be 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Addons Quarkus Data Index Persistence PostgreSQL
 description: Kogito Data Index Persistence PostgreSQL Add-On
 metadata:
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/application.properties
index 6b647a231a..087f52897a 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=postgresql
 
@@ -7,5 +26,5 @@ quarkus.datasource.db-kind=postgresql
 #Hibernate
 quarkus.hibernate-orm.jdbc.timezone=UTC
 quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
-
-quarkus.flyway.locations=classpath:db/migration
\ No newline at end of file
+quarkus.flyway.locations=classpath:db/migration
+quarkus.flyway.repair-at-start=true
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml
index 2f7903a121..68ffe9a4eb 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml
index a21102534f..4aad85a945 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
@@ -22,6 +42,10 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-addons-quarkus-data-index-persistence-common-deployment</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-addons-quarkus-data-index-common-runtime</artifactId>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/AbstractKogitoAddonsQuarkusDataIndexProcessor.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/AbstractKogitoAddonsQuarkusDataIndexProcessor.java
index dde8b38f96..cda0bbdbb6 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/AbstractKogitoAddonsQuarkusDataIndexProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/AbstractKogitoAddonsQuarkusDataIndexProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.deployment;
 
 import org.jboss.jandex.DotName;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml
index 7669cc9a55..87e3aa909e 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml
index afaadc30bb..43cbbd3c1a 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexBuildConfig.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexBuildConfig.java
index d83b42c359..a5385ac669 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexBuildConfig.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexBuildConfig.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.addon.config;
 
 import io.quarkus.runtime.annotations.ConfigItem;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.java
index becc6a7781..aed72e1eb9 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.addon.config;
 
 import java.util.Optional;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.java
index 39bf898ed7..09c75923f7 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.addon.config;
 
 import io.quarkus.runtime.annotations.ConfigItem;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
index 8ec4f67ed6..33b10f4523 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.addon.graphql;
 
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
index f93b4ce3f2..29ab0a1d8a 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.index.addon.vertx;
 
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/resources/META-INF/beans.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/resources/META-INF/beans.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml
index 5d25a8d570..ac9c148914 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InfinispanDataIndexProcessor.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InfinispanDataIndexProcessor.java
index b6219a9d5e..0fc6070abd 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InfinispanDataIndexProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InfinispanDataIndexProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/dataindex.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/dataindex.html
index eea31b584b..c121df7858 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/dataindex.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/dataindex.html
@@ -1,16 +1,32 @@
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-{/style}
-{#title}Data Index GraphQL UI{/title}
-{#body}
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+{/style} {#title}Data Index GraphQL UI{/title} {#body}
 <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-12">
-        <iframe style="width: 100vw;height: 100vh;position: relative;" src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/" style="border:none;"></iframe>
-    </div>
+  <div class="col-xs-12 col-sm-12 col-md-12">
+    <iframe
+      style="width: 100vw; height: 100vh; position: relative"
+      src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/"
+      style="border: none"
+    ></iframe>
+  </div>
 </div>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/embedded.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/embedded.html
index cc7a241e02..09553d5f19 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/embedded.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/src/main/resources/dev-templates/embedded.html
@@ -1,4 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <a href="{urlbase}/dataindex" class="badge badge-light">
-    <i class="fa fa-map-signs fa-fw"></i>
-    Data Index GraphQL UI
-</a>
\ No newline at end of file
+  <i class="fa fa-map-signs fa-fw"></i>
+  Data Index GraphQL UI
+</a>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml
index f34efb1501..e887894a38 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/main/resources/application.properties
index a247c8061f..46a76d7e35 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/main/resources/application.properties
@@ -1,3 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=infinispan
 
-quarkus.kogito.data-index.graphql.ui.always-include=true
\ No newline at end of file
+quarkus.kogito.data-index.graphql.ui.always-include=true
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java
index e59d8fc972..9efaaa9e13 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml
index 45705a4218..f74ba06e56 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/main/resources/application.properties
index a247c8061f..46a76d7e35 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/main/resources/application.properties
@@ -1,3 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=infinispan
 
-quarkus.kogito.data-index.graphql.ui.always-include=true
\ No newline at end of file
+quarkus.kogito.data-index.graphql.ui.always-include=true
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java
index 5bf66c83b7..1e6eac629c 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InfinispanQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml
index a6f6299562..7d74daf5bf 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml
index 2a2f40af4a..f0bf79556c 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index bdbdadb4de..c7eab06352 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Addons Quarkus Data Index Infinispan
 description: Kogito Data Index Infinispan Add-On
 metadata:
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml
index 7694ed5beb..7328c77467 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InMemoryDataIndexProcessor.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InMemoryDataIndexProcessor.java
index bbea5a5c1f..3290dee299 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InMemoryDataIndexProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/InMemoryDataIndexProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.deployment;
 
 import io.quarkus.deployment.annotations.BuildProducer;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/dataindex.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/dataindex.html
index eea31b584b..c121df7858 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/dataindex.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/dataindex.html
@@ -1,16 +1,32 @@
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-{/style}
-{#title}Data Index GraphQL UI{/title}
-{#body}
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+{/style} {#title}Data Index GraphQL UI{/title} {#body}
 <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-12">
-        <iframe style="width: 100vw;height: 100vh;position: relative;" src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/" style="border:none;"></iframe>
-    </div>
+  <div class="col-xs-12 col-sm-12 col-md-12">
+    <iframe
+      style="width: 100vw; height: 100vh; position: relative"
+      src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/"
+      style="border: none"
+    ></iframe>
+  </div>
 </div>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/embedded.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/embedded.html
index cc7a241e02..09553d5f19 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/embedded.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/src/main/resources/dev-templates/embedded.html
@@ -1,4 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <a href="{urlbase}/dataindex" class="badge badge-light">
-    <i class="fa fa-map-signs fa-fw"></i>
-    Data Index GraphQL UI
-</a>
\ No newline at end of file
+  <i class="fa fa-map-signs fa-fw"></i>
+  Data Index GraphQL UI
+</a>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml
index b7bfc2c368..2592adea2d 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/main/resources/application.properties
index b111c27b59..77ec1076d1 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/main/resources/application.properties
@@ -1 +1,27 @@
-quarkus.kogito.data-index.graphql.ui.always-include=true
\ No newline at end of file
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+quarkus.kogito.data-index.graphql.ui.always-include=true
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java
index 5aa9229e97..2cb3475e73 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml
index 6c120fcad4..bf3f3a7d86 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/main/resources/application.properties
index b111c27b59..77ec1076d1 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/main/resources/application.properties
@@ -1 +1,27 @@
-quarkus.kogito.data-index.graphql.ui.always-include=true
\ No newline at end of file
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+quarkus.kogito.data-index.graphql.ui.always-include=true
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java
index e48b742e72..dcc1f26b70 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/InMemoryQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml
index 7dc26b852d..f7b9574696 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml
index 3c9371e854..8f34b531aa 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 4e218c7502..81daebd833 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Addons Quarkus Data Index In-memory
 description: Kogito Data Index In-memory Add-On
 metadata:
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties
index 3544e58cb0..587a8cf10c 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=postgresql
 kogito.data-index.domain-indexing=false
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml
index 0ed4623487..fb30219c39 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/MongoDataIndexProcessor.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/MongoDataIndexProcessor.java
index d724534128..ce6bfb77de 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/MongoDataIndexProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/MongoDataIndexProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/dataindex.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/dataindex.html
index eea31b584b..c121df7858 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/dataindex.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/dataindex.html
@@ -1,16 +1,32 @@
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-{/style}
-{#title}Data Index GraphQL UI{/title}
-{#body}
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+{/style} {#title}Data Index GraphQL UI{/title} {#body}
 <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-12">
-        <iframe style="width: 100vw;height: 100vh;position: relative;" src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/" style="border:none;"></iframe>
-    </div>
+  <div class="col-xs-12 col-sm-12 col-md-12">
+    <iframe
+      style="width: 100vw; height: 100vh; position: relative"
+      src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/"
+      style="border: none"
+    ></iframe>
+  </div>
 </div>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/embedded.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/embedded.html
index cc7a241e02..09553d5f19 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/embedded.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/src/main/resources/dev-templates/embedded.html
@@ -1,4 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <a href="{urlbase}/dataindex" class="badge badge-light">
-    <i class="fa fa-map-signs fa-fw"></i>
-    Data Index GraphQL UI
-</a>
\ No newline at end of file
+  <i class="fa fa-map-signs fa-fw"></i>
+  Data Index GraphQL UI
+</a>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml
index dfbb6f39b9..cfec10de2c 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/main/resources/application.properties
index 8e215c2eed..1e9d0ed64a 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/main/resources/application.properties
@@ -1,5 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=mongodb
 
 quarkus.kogito.data-index.graphql.ui.always-include=true
 # MongoDB
-quarkus.mongodb.database=kogito
\ No newline at end of file
+quarkus.mongodb.database=kogito
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java
index 16ab87bbe1..6b6e309c96 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml
index 0001c4ea1a..af59ab74ff 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/main/resources/application.properties
index 8e215c2eed..1e9d0ed64a 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/main/resources/application.properties
@@ -1,5 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=mongodb
 
 quarkus.kogito.data-index.graphql.ui.always-include=true
 # MongoDB
-quarkus.mongodb.database=kogito
\ No newline at end of file
+quarkus.mongodb.database=kogito
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java
index 6e4370ad7a..ae4134894b 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/MongoQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml
index de1658a77f..4620895c92 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml
index 49b7fada24..bca58f0347 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index d65194a8c7..e04f00a450 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Addons Quarkus Data Index MongoDB
 description: Kogito Data Index MongoDB Add-On
 metadata:
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/application.properties
index 8eb5c97876..bc7ef3e84d 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/src/main/resources/application.properties
@@ -1,2 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=mongodb
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml
index 4b4e861810..d3deaf0b6e 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/PostgreSQLDataIndexProcessor.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/PostgreSQLDataIndexProcessor.java
index f56793ed7c..31e077e7ea 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/PostgreSQLDataIndexProcessor.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/data/index/deployment/PostgreSQLDataIndexProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/dataindex.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/dataindex.html
index eea31b584b..c121df7858 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/dataindex.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/dataindex.html
@@ -1,16 +1,32 @@
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-{/style}
-{#title}Data Index GraphQL UI{/title}
-{#body}
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+{/style} {#title}Data Index GraphQL UI{/title} {#body}
 <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-12">
-        <iframe style="width: 100vw;height: 100vh;position: relative;" src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/" style="border:none;"></iframe>
-    </div>
+  <div class="col-xs-12 col-sm-12 col-md-12">
+    <iframe
+      style="width: 100vw; height: 100vh; position: relative"
+      src="{config:property('quarkus.http.root-path')}{config:property('quarkus.http.non-application-root-path')}/graphql-ui/"
+      style="border: none"
+    ></iframe>
+  </div>
 </div>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/embedded.html b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/embedded.html
index cc7a241e02..09553d5f19 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/embedded.html
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/src/main/resources/dev-templates/embedded.html
@@ -1,4 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <a href="{urlbase}/dataindex" class="badge badge-light">
-    <i class="fa fa-map-signs fa-fw"></i>
-    Data Index GraphQL UI
-</a>
\ No newline at end of file
+  <i class="fa fa-map-signs fa-fw"></i>
+  Data Index GraphQL UI
+</a>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml
index 8e27f86341..c7ce503ead 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/main/resources/application.properties
index 115d80eed3..6f4c0f96ca 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/main/resources/application.properties
@@ -1,6 +1,32 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=jdbc
 quarkus.flyway.migrate-at-start=true
 
 quarkus.kogito.data-index.graphql.ui.always-include=true
 
 quarkus.datasource.db-kind=postgresql
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
index 34219bd0b6..0ad49c47b7 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
@@ -36,7 +38,9 @@ class PostgreSQLQuarkusAddonDataIndexIT {
 
     @Test
     void testDataIndexAddon() {
-        given().contentType(ContentType.JSON).body("{ \"query\" : \"{ProcessDefinitions{ id, version, name } }\" }")
+        String processDefId = "hello";
+        given().contentType(ContentType.JSON).body("{ \"query\" : \"{ProcessDefinitions(where: { id: {equal: \\\"" + processDefId +
+                "\\\"}}){ id, version, name } }\" }")
                 .when().post("/graphql")
                 .then().statusCode(200)
                 .body("data.ProcessDefinitions.size()", is(1))
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml
index 7b7e71a70d..4f5ec35d9a 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/main/resources/application.properties
index 115d80eed3..6f4c0f96ca 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/main/resources/application.properties
@@ -1,6 +1,32 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.persistence.type=jdbc
 quarkus.flyway.migrate-at-start=true
 
 quarkus.kogito.data-index.graphql.ui.always-include=true
 
 quarkus.datasource.db-kind=postgresql
+# Not using Keycloak Dev service in test
+quarkus.keycloak.devservices.enabled=false
+
+# Security
+quarkus.oidc.enabled=false
+quarkus.oidc.tenant-enabled=false
+quarkus.oidc.auth-server-url=none
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
index dffb6bdfeb..7259a80f5d 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.data.index.it;
 
 import org.junit.jupiter.api.Test;
@@ -37,7 +39,9 @@ class PostgreSQLQuarkusAddonDataIndexIT {
 
     @Test
     void testDataIndexAddon() {
-        given().contentType(ContentType.JSON).body("{ \"query\" : \"{ProcessDefinitions{ id, version, name } }\" }")
+        String processDefId = "greet";
+        given().contentType(ContentType.JSON).body("{ \"query\" : \"{ProcessDefinitions(where: { id: {equal: \\\"" + processDefId +
+                "\\\"}}){ id, version, name } }\" }")
                 .when().post("/graphql")
                 .then().statusCode(200)
                 .body("data.ProcessDefinitions.size()", is(1))
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml
index e1502a50a6..932832ab6c 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml
index df7cf27fa9..db6cb62c9f 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 4c4a9a3fc3..c06bb06e62 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Addons Quarkus Data Index PostgreSQL
 description: Kogito Data Index PostgreSQL Add-On
 metadata:
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/application.properties b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/application.properties
index 06b1733993..06fc524aba 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/application.properties
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Data Index
 kogito.apps.persistence.type=postgresql
 kogito.data-index.domain-indexing=false
@@ -9,5 +28,4 @@ quarkus.datasource.db-kind=postgresql
 #Hibernate
 quarkus.hibernate-orm.jdbc.timezone=UTC
 quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
-
 quarkus.flyway.locations=classpath:db/migration
\ No newline at end of file
diff --git a/data-index/kogito-addons-quarkus-data-index/pom.xml b/data-index/kogito-addons-quarkus-data-index/pom.xml
index 519857e681..f1890693a7 100644
--- a/data-index/kogito-addons-quarkus-data-index/pom.xml
+++ b/data-index/kogito-addons-quarkus-data-index/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
diff --git a/data-index/pom.xml b/data-index/pom.xml
index f43d362431..a789840f65 100644
--- a/data-index/pom.xml
+++ b/data-index/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -24,4 +44,4 @@
     <module>kogito-addons-quarkus-data-index</module>
   </modules>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/explainability/explainability-api/pom.xml b/explainability/explainability-api/pom.xml
index 93ff8f9f20..332e9f8932 100644
--- a/explainability/explainability-api/pom.xml
+++ b/explainability/explainability-api/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
index 3f8545317d..d8db183feb 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
index fbd9b8eeda..1830a5968a 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.api;
 
 import java.util.Objects;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomain.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomain.java
index 6b27d181f6..3c97eeda13 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomain.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomain.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
index 90b04c511c..2a13a1a792 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
index b189a93ea9..9b19c33640 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
index c5ab1a5a71..c35367153e 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.api;
 
 import java.util.Collection;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
index 1a1eb4d00f..38580f1440 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.api;
 
 import java.util.Collection;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomain.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomain.java
index cadae35a29..64b15cb313 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomain.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomain.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainCollectionValue.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainCollectionValue.java
index cb0460897c..a6383c913f 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainCollectionValue.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainCollectionValue.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainStructureValue.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainStructureValue.java
index 93d767e4a7..f894a0fb9d 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainStructureValue.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainStructureValue.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainUnitValue.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainUnitValue.java
index bfe9d131a9..516d211da5 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainUnitValue.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainUnitValue.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainValue.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainValue.java
index cf77f9d9d0..d7cfe490f7 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainValue.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualSearchDomainValue.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ExplainabilityStatus.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ExplainabilityStatus.java
index 36c2db87be..8a9f6d414a 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ExplainabilityStatus.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ExplainabilityStatus.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/FeatureImportanceModel.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/FeatureImportanceModel.java
index 41cb9ec607..0d42f82bb0 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/FeatureImportanceModel.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/FeatureImportanceModel.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/HasNameValue.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/HasNameValue.java
index b7d688b7f6..75e5ba4fd6 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/HasNameValue.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/HasNameValue.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
index 702b94eda2..02f18fc55a 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
index fee2c94b12..af066bcd4b 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.api;
 
 import java.util.Collections;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
index ba7bce8676..3727bdf6f8 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/NamedTypedValue.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/NamedTypedValue.java
index 771d231428..35aa22e2d4 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/NamedTypedValue.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/NamedTypedValue.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/SaliencyModel.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/SaliencyModel.java
index b0b0f00b08..b5bd777549 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/SaliencyModel.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/SaliencyModel.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-api/src/test/java/org/kie/kogito/explainability/api/CounterfactualDomainSerialisationTest.java b/explainability/explainability-api/src/test/java/org/kie/kogito/explainability/api/CounterfactualDomainSerialisationTest.java
index c8be380418..16165ffc02 100644
--- a/explainability/explainability-api/src/test/java/org/kie/kogito/explainability/api/CounterfactualDomainSerialisationTest.java
+++ b/explainability/explainability-api/src/test/java/org/kie/kogito/explainability/api/CounterfactualDomainSerialisationTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.api;
 
diff --git a/explainability/explainability-service-messaging/pom.xml b/explainability/explainability-service-messaging/pom.xml
index 00f6359ba9..2e43121761 100644
--- a/explainability/explainability-service-messaging/pom.xml
+++ b/explainability/explainability-service-messaging/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java b/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
index d8da956d0d..da33c98eb2 100644
--- a/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
+++ b/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.messaging;
 
diff --git a/explainability/explainability-service-messaging/src/main/resources/META-INF/beans.xml b/explainability/explainability-service-messaging/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/explainability/explainability-service-messaging/src/main/resources/META-INF/beans.xml
+++ b/explainability/explainability-service-messaging/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/explainability/explainability-service-messaging/src/main/resources/application.properties b/explainability/explainability-service-messaging/src/main/resources/application.properties
index d02b64ba52..cf636c176a 100644
--- a/explainability/explainability-service-messaging/src/main/resources/application.properties
+++ b/explainability/explainability-service-messaging/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Container image
 quarkus.container-image.build=${quarkus.build.image:true}
 quarkus.container-image.group=org.kie.kogito
diff --git a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
index 25bdb52086..2874f5f7c7 100644
--- a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
+++ b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.messaging;
 
 import java.io.IOException;
diff --git a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityCloudEventBuilder.java b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityCloudEventBuilder.java
index 5b6d2dced6..21dd689de1 100644
--- a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityCloudEventBuilder.java
+++ b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityCloudEventBuilder.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.messaging;
 
 import java.net.URI;
diff --git a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerCounterfactualsIT.java b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerCounterfactualsIT.java
index 27e0b103ba..691a65171c 100644
--- a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerCounterfactualsIT.java
+++ b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerCounterfactualsIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.messaging;
 
diff --git a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerLIMEIT.java b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerLIMEIT.java
index b7706d17c5..eaf78ae6f3 100644
--- a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerLIMEIT.java
+++ b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerLIMEIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.messaging;
 
 import java.util.Collections;
diff --git a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerTest.java b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerTest.java
index d3405bd90a..067a768fcf 100644
--- a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerTest.java
+++ b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandlerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.messaging;
 
 import java.util.Collections;
diff --git a/explainability/explainability-service-messaging/src/test/resources/application.properties b/explainability/explainability-service-messaging/src/test/resources/application.properties
index 5c0874db4b..2cfbd73db4 100644
--- a/explainability/explainability-service-messaging/src/test/resources/application.properties
+++ b/explainability/explainability-service-messaging/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Kafka Explainability Request
 mp.messaging.incoming.trusty-explainability-request.group.id=trusty
 mp.messaging.incoming.trusty-explainability-request.connector=smallrye-kafka
diff --git a/explainability/explainability-service-rest/pom.xml b/explainability/explainability-service-rest/pom.xml
index 457fcbd883..c6334690fc 100644
--- a/explainability/explainability-service-rest/pom.xml
+++ b/explainability/explainability-service-rest/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java b/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
index af971e5b1b..67b36a591f 100644
--- a/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
+++ b/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.rest;
 
diff --git a/explainability/explainability-service-rest/src/main/resources/META-INF/beans.xml b/explainability/explainability-service-rest/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/explainability/explainability-service-rest/src/main/resources/META-INF/beans.xml
+++ b/explainability/explainability-service-rest/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/explainability/explainability-service-rest/src/main/resources/application.properties b/explainability/explainability-service-rest/src/main/resources/application.properties
index 9bf7ce6fc0..eabb5fc8c6 100644
--- a/explainability/explainability-service-rest/src/main/resources/application.properties
+++ b/explainability/explainability-service-rest/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #oidc
 quarkus.oidc.enabled=true
 quarkus.oidc.tenant-enabled=false
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1IT.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1IT.java
index 23e0ea3b82..2ef891a9f1 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1IT.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1IT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.rest;
 
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java
index 7ee202b4b4..ee532e9153 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.rest;
 
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
index 5b9b38f0f4..aadffa9409 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.rest;
 
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
index 42e4153ab0..958dcc4048 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.rest;
 
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderMock.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderMock.java
index cc9836e1dc..231222254f 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderMock.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderMock.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.rest;
 
diff --git a/explainability/explainability-service-rest/src/test/resources/application.properties b/explainability/explainability-service-rest/src/test/resources/application.properties
index 0eca8533b4..cc897b8e1a 100644
--- a/explainability/explainability-service-rest/src/test/resources/application.properties
+++ b/explainability/explainability-service-rest/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #oidc
 quarkus.oidc.enabled=true
 quarkus.oidc.tenant-enabled=false
@@ -5,3 +24,6 @@ quarkus.oidc.auth-server-url=none
 %keycloak.quarkus.oidc.tenant-enabled=true
 %keycloak.quarkus.oidc.client-id=kogito-app
 %keycloak.quarkus.oidc.credentials.secret=secret
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
diff --git a/explainability/explainability-service/pom.xml b/explainability/explainability-service/pom.xml
index a5e964b393..f4ea39a3e4 100644
--- a/explainability/explainability-service/pom.xml
+++ b/explainability/explainability-service/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ConversionUtils.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ConversionUtils.java
index ae3b15877d..5d6f08245f 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ConversionUtils.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ConversionUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability;
 
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationService.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationService.java
index 0d9d174c13..c5ebfe9bce 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationService.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability;
 
 import java.util.concurrent.CompletionStage;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
index ed520823d9..f5b9f46e73 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability;
 
 import java.util.concurrent.CompletionStage;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactory.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactory.java
index e799de08b1..69aec23cae 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactory.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactory.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability;
 
 import java.util.Collection;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
index c9ff4ad370..76adbc6160 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability;
 
 import java.util.Collection;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/RemotePredictionProvider.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/RemotePredictionProvider.java
index dfbcfcace9..439d81d7e0 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/RemotePredictionProvider.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/RemotePredictionProvider.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability;
 
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
index 16631cb22e..dd7070d27e 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.handlers;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
index ecab71879e..dc5ef56876 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
index 3781aff0fe..995ce31f32 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability.handlers;
 
 import java.security.SecureRandom;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
index 3c98cacf95..bab1445814 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandler.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandler.java
index 455535ffc5..df0225c5a8 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandler.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
index 45856bfb5e..0653ceda29 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictInput.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictInput.java
index c92f36a89e..da7727ddd2 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictInput.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictInput.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.models;
 
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictOutput.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictOutput.java
index b76343d19d..f0f663811b 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictOutput.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/models/PredictOutput.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.models;
 
diff --git a/explainability/explainability-service/src/main/resources/META-INF/beans.xml b/explainability/explainability-service/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/explainability/explainability-service/src/main/resources/META-INF/beans.xml
+++ b/explainability/explainability-service/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/explainability/explainability-service/src/main/resources/application.properties b/explainability/explainability-service/src/main/resources/application.properties
index 54ce9c8415..f2372f8e04 100644
--- a/explainability/explainability-service/src/main/resources/application.properties
+++ b/explainability/explainability-service/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Incoming Explainability Requests
 mp.messaging.incoming.trusty-explainability-request.group.id=explainability-service
 mp.messaging.incoming.trusty-explainability-request.connector=smallrye-kafka
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ConversionUtilsTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ConversionUtilsTest.java
index b2026206e4..464e63c966 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ConversionUtilsTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ConversionUtilsTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability;
 
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
index cb59f4827b..32fa35a3b6 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/PredictionProviderFactoryImplTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/PredictionProviderFactoryImplTest.java
index cb5fdb8864..e6ace68808 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/PredictionProviderFactoryImplTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/PredictionProviderFactoryImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability;
 
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/RemotePredictionProviderTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/RemotePredictionProviderTest.java
index 151e2c49d0..f757891d05 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/RemotePredictionProviderTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/RemotePredictionProviderTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability;
 
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/TestUtils.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/TestUtils.java
index b1bafff09d..4b92d5515d 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/TestUtils.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/TestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.explainability;
 
 import java.util.ArrayList;
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducerTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducerTest.java
index 53d1cf4895..4a0dee2bdb 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducerTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandlerTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandlerTest.java
index 48aecc15a0..ab58f9f6fb 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandlerTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandlerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerProducerTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerProducerTest.java
index e878763265..6ea1ba65b9 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerProducerTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerProducerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandlerTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandlerTest.java
index d6c63c604f..52fb721083 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandlerTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandlerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
index b351192b71..a1ae055fe9 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.explainability.handlers;
 
diff --git a/explainability/pom.xml b/explainability/pom.xml
index 539118c858..9348831a3b 100644
--- a/explainability/pom.xml
+++ b/explainability/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jitexecutor/jitexecutor-bpmn/pom.xml b/jitexecutor/jitexecutor-bpmn/pom.xml
index 51cd7a61cf..d470dd3ab7 100644
--- a/jitexecutor/jitexecutor-bpmn/pom.xml
+++ b/jitexecutor/jitexecutor-bpmn/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNService.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNService.java
index 5697131ac8..cc156aa506 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNService.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.bpmn;
 
 import org.kie.kogito.jitexecutor.bpmn.responses.JITBPMNValidationResult;
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
index ea7a5d79ad..c0b70cffbe 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.bpmn;
 
 import java.io.ByteArrayInputStream;
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
index 327a868783..5022f49037 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.bpmn.api;
 
 import javax.inject.Inject;
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/responses/JITBPMNValidationResult.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/responses/JITBPMNValidationResult.java
index 21211f74c0..d1fa20e9e3 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/responses/JITBPMNValidationResult.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/responses/JITBPMNValidationResult.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jitexecutor.bpmn.responses;
 
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/resources/META-INF/beans.xml b/jitexecutor/jitexecutor-bpmn/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/resources/META-INF/beans.xml
+++ b/jitexecutor/jitexecutor-bpmn/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/resources/application.properties b/jitexecutor/jitexecutor-bpmn/src/main/resources/application.properties
index c09e2b84d1..f43a8a1a7d 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/resources/application.properties
+++ b/jitexecutor/jitexecutor-bpmn/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # quarkus.log.console.enable=true
 # quarkus.log.console.format=%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n
 # quarkus.log.console.level=INFO
diff --git a/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImplTest.java b/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImplTest.java
index 0bff9623a5..4540510703 100644
--- a/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImplTest.java
+++ b/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jitexecutor.bpmn;
 
diff --git a/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/TestingUtils.java b/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/TestingUtils.java
index 589758e809..6364c090f9 100644
--- a/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/TestingUtils.java
+++ b/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/TestingUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jitexecutor.bpmn;
 
diff --git a/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidatorResourceTest.java b/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidatorResourceTest.java
index a06afd1988..79b718e54a 100644
--- a/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidatorResourceTest.java
+++ b/jitexecutor/jitexecutor-bpmn/src/test/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidatorResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.bpmn.api;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-common/pom.xml b/jitexecutor/jitexecutor-common/pom.xml
index a14cd11255..72b0dffee6 100644
--- a/jitexecutor/jitexecutor-common/pom.xml
+++ b/jitexecutor/jitexecutor-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/MultipleResourcesPayload.java b/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/MultipleResourcesPayload.java
index 0a4634458d..ef9f394435 100644
--- a/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/MultipleResourcesPayload.java
+++ b/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/MultipleResourcesPayload.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.common.requests;
 
 import java.util.List;
diff --git a/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/ResourceWithURI.java b/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/ResourceWithURI.java
index 12ece8a9b3..7d74778b9e 100644
--- a/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/ResourceWithURI.java
+++ b/jitexecutor/jitexecutor-common/src/main/java/org/kie/kogito/jitexecutor/common/requests/ResourceWithURI.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.common.requests;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/jitexecutor/jitexecutor-dmn/pom.xml b/jitexecutor/jitexecutor-dmn/pom.xml
index 7873955611..96da553b7f 100644
--- a/jitexecutor/jitexecutor-dmn/pom.xml
+++ b/jitexecutor/jitexecutor-dmn/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java
index e284cb6a40..b8c849638c 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/DMNEvaluator.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn;
 
 import java.io.StringReader;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
index 65c1a8c6f2..ec8b9bde98 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn;
 
 import javax.inject.Singleton;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNService.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNService.java
index d26466bcf2..6db6dbb97e 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNService.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn;
 
 import java.util.Map;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
index c5f9c9c3f9..b2230ecd4d 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn;
 
 import java.util.ArrayList;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/LocalDMNPredictionProvider.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/LocalDMNPredictionProvider.java
index 7f822ac5dc..8950c4c6c4 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/LocalDMNPredictionProvider.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/LocalDMNPredictionProvider.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn;
 
 import java.util.ArrayList;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
index 5c929ebe38..b50ad939ed 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.api;
 
 import java.io.StringReader;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
index 046a5b94d9..6ff12594c4 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.api;
 
 import java.util.HashMap;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
index 86ebaa1958..cec99ab0ee 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.api;
 
 import java.util.Collections;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/requests/JITDMNPayload.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/requests/JITDMNPayload.java
index 78b84fa3b9..178dfd578c 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/requests/JITDMNPayload.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/requests/JITDMNPayload.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.requests;
 
 import java.util.List;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/DMNResultWithExplanation.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/DMNResultWithExplanation.java
index e6489993c9..fd7e7e8486 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/DMNResultWithExplanation.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/DMNResultWithExplanation.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.responses;
 
 import org.kie.kogito.trusty.service.common.responses.SalienciesResponse;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNDecisionResult.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNDecisionResult.java
index 400350bc4c..7348a4dc9c 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNDecisionResult.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNDecisionResult.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jitexecutor.dmn.responses;
 
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNMessage.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNMessage.java
index fa4f25fb89..fb90a077a5 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNMessage.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNMessage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.responses;
 
 import java.io.Serializable;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java
index 145158079d..bfaea16420 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/responses/JITDMNResult.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jitexecutor.dmn.responses;
 
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/utils/ResolveByKey.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/utils/ResolveByKey.java
index e7b55f0813..8377baf6ae 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/utils/ResolveByKey.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/utils/ResolveByKey.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.utils;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/beans.xml b/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/beans.xml
+++ b/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/resources/index.html b/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/resources/index.html
index 7701c9d2a4..91b0c13b65 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/resources/index.html
+++ b/jitexecutor/jitexecutor-dmn/src/main/resources/META-INF/resources/index.html
@@ -1,21 +1,46 @@
-<!doctype html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+
+    <link
+      rel="stylesheet"
+      href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css"
+      integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk"
+      crossorigin="anonymous"
+    />
 
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
- 
     <title>Demo system</title>
   </head>
   <body>
     <nav class="navbar navbar-dark bg-dark">
-      <a class="navbar-brand" href="#">
-      Demo system
-      </a>
+      <a class="navbar-brand" href="#"> Demo system </a>
     </nav>
     <div class="container" id="rrr"></div>
     <script src="bundle.js"></script>
-    
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/jitexecutor/jitexecutor-dmn/src/main/resources/application.properties b/jitexecutor/jitexecutor-dmn/src/main/resources/application.properties
index b53f44c008..0f58730752 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/resources/application.properties
+++ b/jitexecutor/jitexecutor-dmn/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # quarkus.log.console.enable=true
 # quarkus.log.console.format=%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n
 # quarkus.log.console.level=INFO
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java
index b5c84e70d7..cbb79a45a0 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImplTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/OneOfEachTypeTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/OneOfEachTypeTest.java
index 4f68bfc171..38ebd50bf7 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/OneOfEachTypeTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/OneOfEachTypeTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidatorResourceTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidatorResourceTest.java
index 698b249470..68607cff13 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidatorResourceTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidatorResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.api;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java
index d26d3e11e7..c47342d06c 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.api;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/MultipleModelsTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/MultipleModelsTest.java
index cacf7c225a..a18389cfcd 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/MultipleModelsTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/MultipleModelsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.api;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResourceTest.java b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResourceTest.java
index 6fa0c79cc1..07a5920092 100644
--- a/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResourceTest.java
+++ b/jitexecutor/jitexecutor-dmn/src/test/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.dmn.api;
 
 import java.io.IOException;
diff --git a/jitexecutor/jitexecutor-runner/pom.xml b/jitexecutor/jitexecutor-runner/pom.xml
index db0a068198..7c28796217 100644
--- a/jitexecutor/jitexecutor-runner/pom.xml
+++ b/jitexecutor/jitexecutor-runner/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jitexecutor/jitexecutor-runner/src/main/resources/application.properties b/jitexecutor/jitexecutor-runner/src/main/resources/application.properties
index 02f89e44f0..47e4b5dc93 100644
--- a/jitexecutor/jitexecutor-runner/src/main/resources/application.properties
+++ b/jitexecutor/jitexecutor-runner/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 
 quarkus.swagger-ui.always-include=true
diff --git a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/BPMNValidatorResourceIT.java b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/BPMNValidatorResourceIT.java
index a843a8e3c9..4f65bd6bdb 100644
--- a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/BPMNValidatorResourceIT.java
+++ b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/BPMNValidatorResourceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.runner;
 
 import org.kie.kogito.jitexecutor.bpmn.api.BPMNValidatorResourceTest;
diff --git a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/DMNValidatorResourceIT.java b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/DMNValidatorResourceIT.java
index 3c394b6b3a..605bf4ba93 100644
--- a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/DMNValidatorResourceIT.java
+++ b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/DMNValidatorResourceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.runner;
 
 import org.kie.kogito.jitexecutor.dmn.api.DMNValidatorResourceTest;
diff --git a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/JITDMNResourceIT.java b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/JITDMNResourceIT.java
index 1fcbe18c1c..c96efcf0d2 100644
--- a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/JITDMNResourceIT.java
+++ b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/JITDMNResourceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.runner;
 
 import org.kie.kogito.jitexecutor.dmn.api.JITDMNResourceTest;
diff --git a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/MultipleModelsIT.java b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/MultipleModelsIT.java
index a1ab5dfbc4..991e094e00 100644
--- a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/MultipleModelsIT.java
+++ b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/MultipleModelsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.runner;
 
 import org.kie.kogito.jitexecutor.dmn.api.MultipleModelsTest;
diff --git a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/OneOfEachTypeIT.java b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/OneOfEachTypeIT.java
index d80221c42f..25f454ea7f 100644
--- a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/OneOfEachTypeIT.java
+++ b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/OneOfEachTypeIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.runner;
 
 import org.kie.kogito.jitexecutor.dmn.OneOfEachTypeTest;
diff --git a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/SchemaResourceIT.java b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/SchemaResourceIT.java
index b643939020..fbca8bf6e0 100644
--- a/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/SchemaResourceIT.java
+++ b/jitexecutor/jitexecutor-runner/src/test/java/org/kie/kogito/jitexecutor/runner/SchemaResourceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jitexecutor.runner;
 
 import org.kie.kogito.jitexecutor.dmn.api.SchemaResourceTest;
diff --git a/jitexecutor/pom.xml b/jitexecutor/pom.xml
index 8835fe5f3c..d92dec3e4b 100644
--- a/jitexecutor/pom.xml
+++ b/jitexecutor/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml
index 06e4f70195..8fd626db3d 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/main/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessor.java b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/main/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessor.java
index 2f2cd3bab1..9ecd995875 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/main/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessor.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/main/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessor.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient.deployment;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessorTest.java b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessorTest.java
index a9c8489ee8..421daa4914 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessorTest.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/deployment/JobHttpRecipientProcessorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.http.recipient.deployment;
 
 import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/HttpRecipientResourceMock.java b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/HttpRecipientResourceMock.java
index 22a34b289b..db210dfc19 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/HttpRecipientResourceMock.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/HttpRecipientResourceMock.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient.test;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientDevModeTest.java b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientDevModeTest.java
index a510cc1d1d..11e992e7c0 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientDevModeTest.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientDevModeTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient.test;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
index 8e2e552117..cdff7c265d 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient.test;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/pom.xml
index a8213eb5e9..56659a8826 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/pom.xml
+++ b/jobs-service/jobs-recipients/job-http-recipient/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
index c80a5b20f7..ec1c1ffdb8 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
index a7428a6a55..d174f283c4 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
index 55dec85a5b..07a7aae78d 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.java
index dbbcb6caa4..340706c5b9 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 4a89637c86..100d9038bc 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Job Http Recipient extension
 description: Handle HTTP requests based on information from the job recipient.
 metadata:
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpJobExecutorTest.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpJobExecutorTest.java
index 271fc62790..dedcc125f6 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpJobExecutorTest.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpJobExecutorTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.http.recipient;
 
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpRecipientValidatorTest.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpRecipientValidatorTest.java
index c3f44f7455..8afcca7876 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpRecipientValidatorTest.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/test/java/org/kie/kogito/job/http/recipient/HttpRecipientValidatorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.http.recipient;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/jobs-service/jobs-recipients/job-recipient-common-http/pom.xml b/jobs-service/jobs-recipients/job-recipient-common-http/pom.xml
index cab8715fe8..1db77b6b31 100644
--- a/jobs-service/jobs-recipients/job-recipient-common-http/pom.xml
+++ b/jobs-service/jobs-recipients/job-recipient-common-http/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequest.java b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequest.java
index 41d514b065..ab62ff910c 100644
--- a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequest.java
+++ b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.recipient.common.http;
 
diff --git a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
index c81c0a30a2..4761d0248d 100644
--- a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
+++ b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.recipient.common.http;
 
 import java.net.URI;
diff --git a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/converters/HttpConverters.java b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/converters/HttpConverters.java
index d3c062a39b..898a587275 100644
--- a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/converters/HttpConverters.java
+++ b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/converters/HttpConverters.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.job.recipient.common.http.converters;
 
diff --git a/jobs-service/jobs-recipients/job-recipient-common-http/src/test/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutorTest.java b/jobs-service/jobs-recipients/job-recipient-common-http/src/test/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutorTest.java
index 8a19194135..a42789c840 100644
--- a/jobs-service/jobs-recipients/job-recipient-common-http/src/test/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutorTest.java
+++ b/jobs-service/jobs-recipients/job-recipient-common-http/src/test/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.recipient.common.http;
 
 import java.time.temporal.ChronoUnit;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml
index 55ccdf6819..f6155c9f0a 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml
+++ b/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/main/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessor.java b/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/main/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessor.java
index feb3ed38d8..55aae53b9e 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/main/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessor.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/main/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.sink.recipient.deployment;
 
 import org.kie.kogito.job.sink.recipient.SinkJobExecutor;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/test/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessorTest.java b/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/test/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessorTest.java
index 306a033a37..7a93718fd3 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/test/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessorTest.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/deployment/src/test/java/org/kie/kogito/job/sink/recipient/deployment/JobSinkRecipientProcessorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.sink.recipient.deployment;
 
 import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/pom.xml
index 8debc3f99c..086de85355 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/pom.xml
+++ b/jobs-service/jobs-recipients/job-sink-recipient/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
index a1a16586bc..1a5251c2ac 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.java
index 8bd938cbee..180c7141af 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.sink.recipient;
 
 import io.quarkus.runtime.annotations.ConfigItem;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
index 8d8a7360d2..fb31168286 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.sink.recipient;
 
 import java.time.OffsetDateTime;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
index f13433f656..5826feb9de 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.sink.recipient;
 
 import java.net.MalformedURLException;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index a57f4ca8eb..cbde8a946a 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Job Sink Recipient extension
 description: Handle the delivery of cloud events to a knative sink based on the information from the job recipient.
 metadata:
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkJobExecutorTest.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkJobExecutorTest.java
index 96d2827b1e..c691134394 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkJobExecutorTest.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkJobExecutorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.sink.recipient;
 
 import java.net.URI;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidatorTest.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidatorTest.java
index 7b38f6ee72..4e272be143 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidatorTest.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/test/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidatorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.job.sink.recipient;
 
 import java.net.URI;
diff --git a/jobs-service/jobs-recipients/pom.xml b/jobs-service/jobs-recipients/pom.xml
index 07a0031f13..3c30313348 100644
--- a/jobs-service/jobs-recipients/pom.xml
+++ b/jobs-service/jobs-recipients/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
     <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/jobs-service-common/pom.xml b/jobs-service/jobs-service-common/pom.xml
index c479c65ecb..defe64921f 100644
--- a/jobs-service/jobs-service-common/pom.xml
+++ b/jobs-service/jobs-service-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/events/JobDataEvent.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/events/JobDataEvent.java
index 5000e29f21..4fd02ead88 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/events/JobDataEvent.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/events/JobDataEvent.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.events;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/InvalidScheduleTimeException.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/InvalidScheduleTimeException.java
index ca356e5d70..48ffe480c0 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/InvalidScheduleTimeException.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/InvalidScheduleTimeException.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.exception;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/JobValidationException.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/JobValidationException.java
index 65d91269e7..f9b7e8ace2 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/JobValidationException.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/exception/JobValidationException.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.exception;
 
 public class JobValidationException extends RuntimeException {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java
index c3f932c0f2..207335f46a 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.executor;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/job/DelegateJob.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/job/DelegateJob.java
index 2a9080ec65..0cd6cc081e 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/job/DelegateJob.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/job/DelegateJob.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.job;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java
index e02ccf9760..b334e424bd 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.json;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java
index bcbaf4f9af..37bda9e54a 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.management;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java
index 5108b28719..80101b912c 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.management;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java
index 517a3afa85..0c0de570d3 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.management;
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/MessagingChangeEvent.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/MessagingChangeEvent.java
index 358663b722..272a29f0c6 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/MessagingChangeEvent.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/MessagingChangeEvent.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.management;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/ReleaseLeaderEvent.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/ReleaseLeaderEvent.java
index f10e5315f1..051f8390e0 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/ReleaseLeaderEvent.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/ReleaseLeaderEvent.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.management;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingConsumer.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingConsumer.java
index 8b605df896..31c75723a2 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingConsumer.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingConsumer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingHandler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingHandler.java
index b7ba8aacbe..89cbd463c1 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingHandler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/MessagingHandler.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 public interface MessagingHandler {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java
index fb5e9360b8..5739f25449 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/v2/MessagingConsumer.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/v2/MessagingConsumer.java
index 6e0d610df0..11b49f46a3 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/v2/MessagingConsumer.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/messaging/v2/MessagingConsumer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.v2;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilter.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilter.java
index b38d400dca..43474ae5cc 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilter.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.openapi;
 
 import java.util.Arrays;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/reflection/ReflectionConfiguration.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/reflection/ReflectionConfiguration.java
index f9fbfe386e..cb2d37a12b 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/reflection/ReflectionConfiguration.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/reflection/ReflectionConfiguration.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.reflection;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/JobServiceManagementRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/JobServiceManagementRepository.java
index 4f3526711e..405c6de6e5 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/JobServiceManagementRepository.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/JobServiceManagementRepository.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/ReactiveJobRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/ReactiveJobRepository.java
index bcb2249968..b96c021240 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/ReactiveJobRepository.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/ReactiveJobRepository.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/BaseReactiveJobRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/BaseReactiveJobRepository.java
index 57e21ed278..2d7a402ac8 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/BaseReactiveJobRepository.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/BaseReactiveJobRepository.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.impl;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java
index da2ecfba8c..3d2da793cc 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.impl;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java
index 74592869bf..ee7a88b674 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.impl;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java
index aa961e7683..4cbb0ad1bf 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.impl;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java
index 7e8cba935a..3f1c2b9df1 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.marshaller;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/Marshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/Marshaller.java
index f7bc7803d8..8a54fbd8ae 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/Marshaller.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/Marshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.marshaller;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java
index ed0dea5561..12812f945c 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.marshaller;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java
index b74f35cb5e..2359a7b2b9 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.marshaller;
 
 import java.time.temporal.ChronoUnit;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java
index 507dcc605b..48b9bb9e5c 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java
index 2608df99c8..9bb98f0a32 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java
index edfed3472a..0da279515e 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/RestApiConstants.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/RestApiConstants.java
index b0e0912417..4f0ae193ee 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/RestApiConstants.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/RestApiConstants.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java
index 06dfdbf58d..cd7557aa72 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.error;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
index 79ed119fd4..55cd6c55e9 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.error;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/ErrorResponse.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/ErrorResponse.java
index 53b47d60a5..f401327fc3 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/ErrorResponse.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/ErrorResponse.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.error;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
index 81d29552b8..0a7207d1a2 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.error;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java
index 6aa59d40ac..d92d13528f 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.error;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java
index 9da96f2f41..1df46f4d32 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.error;
 
 import javax.ws.rs.ext.Provider;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
index 67dd5a4512..dc084bc419 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.error;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
index fb96f2b4e5..26cf01e545 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.error;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java
index 5c0f5eab7b..4a17ec57dc 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.v2;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
index 723d12a476..c18029793f 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobScheduler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobScheduler.java
index f7e2ba5a56..af50c4f0d2 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobScheduler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
index 54b71d3e78..3649eafcd2 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
@@ -1,29 +1,31 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 
-import javax.annotation.Priority;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
-import javax.interceptor.Interceptor;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
@@ -37,7 +39,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.quarkus.runtime.StartupEvent;
 import io.vertx.mutiny.core.Vertx;
 
 @ApplicationScoped
@@ -73,26 +74,45 @@ public class JobSchedulerManager {
 
     @Inject
     Vertx vertx;
-    private AtomicBoolean enabled = new AtomicBoolean(false);
-
-    void onStartup(@Observes @Priority(Interceptor.Priority.PLATFORM_AFTER) StartupEvent startupEvent) {
-        if (loadJobIntervalInMinutes > schedulerChunkInMinutes) {
-            LOGGER.warn("The loadJobIntervalInMinutes ({}) cannot be greater than schedulerChunkInMinutes ({}), " +
-                    "setting value {} for both",
-                    loadJobIntervalInMinutes,
-                    schedulerChunkInMinutes,
-                    schedulerChunkInMinutes);
-            loadJobIntervalInMinutes = schedulerChunkInMinutes;
+    final AtomicBoolean enabled = new AtomicBoolean(false);
+
+    final AtomicLong periodicTimerIdForLoadJobs = new AtomicLong(-1l);
+
+    private void startJobsLoadingFromRepositoryTask() {
+        //guarantee it starts the task just in case it is not already active
+        if (periodicTimerIdForLoadJobs.get() < 0) {
+            if (loadJobIntervalInMinutes > schedulerChunkInMinutes) {
+                LOGGER.warn("The loadJobIntervalInMinutes ({}) cannot be greater than schedulerChunkInMinutes ({}), " +
+                        "setting value {} for both",
+                        loadJobIntervalInMinutes,
+                        schedulerChunkInMinutes,
+                        schedulerChunkInMinutes);
+                loadJobIntervalInMinutes = schedulerChunkInMinutes;
+            }
+            //first execution
+            vertx.runOnContext(this::loadJobDetails);
+            //next executions to run periodically
+            periodicTimerIdForLoadJobs.set(vertx.setPeriodic(TimeUnit.MINUTES.toMillis(loadJobIntervalInMinutes), id -> loadJobDetails()));
         }
+    }
 
-        //first execution
-        vertx.runOnContext(this::loadJobDetails);
-        //periodic execution
-        vertx.setPeriodic(TimeUnit.MINUTES.toMillis(loadJobIntervalInMinutes), id -> loadJobDetails());
+    private void cancelJobsLoadingFromRepositoryTask() {
+        if (periodicTimerIdForLoadJobs.get() > 0) {
+            vertx.cancelTimer(periodicTimerIdForLoadJobs.get());
+            //negative id indicates this is not active anymore
+            periodicTimerIdForLoadJobs.set(-1);
+        }
     }
 
-    protected void onMessagingStatusChange(@Observes MessagingChangeEvent event) {
-        this.enabled.set(event.isEnabled());
+    protected synchronized void onMessagingStatusChange(@Observes MessagingChangeEvent event) {
+        boolean wasEnabled = enabled.getAndSet(event.isEnabled());
+        if (enabled.get() && !wasEnabled) {
+            // good, avoid starting twice if we receive two consecutive enabled = true
+            startJobsLoadingFromRepositoryTask();
+        } else if (!enabled.get()) {
+            // but only cancel if we receive enabled = false, otherwise with two consecutive enable we are also cancelling.
+            cancelJobsLoadingFromRepositoryTask();
+        }
     }
 
     //Runs periodically loading the jobs from the repository in chunks
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/ReactiveJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/ReactiveJobScheduler.java
index aeb6acadaa..07948f5c4b 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/ReactiveJobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/ReactiveJobScheduler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
index f0173012b2..8c0828e1da 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler.impl;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java
index 25a6464a09..503e08940a 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler.impl;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AbstractJobStreams.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AbstractJobStreams.java
index 76e28d18a1..5899942821 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AbstractJobStreams.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AbstractJobStreams.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.stream;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AvailableStreams.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AvailableStreams.java
index 7215279cb0..a4a33ca600 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AvailableStreams.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/AvailableStreams.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.stream;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java
index 156e7fafca..793744677d 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.stream;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/ErrorHandling.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/ErrorHandling.java
index e46567a56f..a6bed7431c 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/ErrorHandling.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/ErrorHandling.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.utils;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/FunctionsUtil.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/FunctionsUtil.java
index de14dc6f1c..571b6b36e6 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/FunctionsUtil.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/utils/FunctionsUtil.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.utils;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java
index 5cd70b8008..c3fae95e8e 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.validation;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java
index 1ece479993..9ce3080cc7 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.validation;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java
index 4333a3f653..8f752c617a 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.validation;
 
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
index 225674149b..2c145433e7 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.validation;
 
 import java.util.List;
diff --git a/jobs-service/jobs-service-common/src/main/resources/META-INF/beans.xml b/jobs-service/jobs-service-common/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jobs-service/jobs-service-common/src/main/resources/META-INF/beans.xml
+++ b/jobs-service/jobs-service-common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties b/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties
index 916065faa4..8e81e4c9ce 100644
--- a/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties
+++ b/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties
@@ -1,17 +1,20 @@
 #
-# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Log Config
@@ -33,9 +36,6 @@ quarkus.http.cors.origins=/.*/
 quarkus.http.limits.max-body-size=10M
 quarkus.http.port=8080
 
-# Swagger
-quarkus.swagger-ui.always-include=true
-
 # OpenAPI document extensions
 mp.openapi.filter=org.kie.kogito.jobs.service.openapi.JobServiceModelFilter
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/TestUtils.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/TestUtils.java
index 35682f3cd8..7d0e433ce8 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/TestUtils.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/TestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service;
 
 import java.net.URL;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/health/HealthCheckUtils.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/health/HealthCheckUtils.java
index 95f563e3e9..ed0fec7e43 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/health/HealthCheckUtils.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/health/HealthCheckUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.health;
 
 import java.util.concurrent.TimeUnit;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java
index 5fed08fd87..9b6648d05b 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.management;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
index 406a18feb8..4fe11b8a57 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import java.util.ArrayList;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseEventsSupportTestProfile.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseEventsSupportTestProfile.java
index a96c79a4d5..b5036f1607 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseEventsSupportTestProfile.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseEventsSupportTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import java.util.Collections;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java
index d32b575d99..2cb4b7f727 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import java.net.URI;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumerTest.java
index 1eec50af3d..06c45a7339 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/ReactiveMessagingEventConsumerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/v2/MessagingEventConsumerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/v2/MessagingEventConsumerTest.java
index 55cff83b45..577c597aa3 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/v2/MessagingEventConsumerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/v2/MessagingEventConsumerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.v2;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilterTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilterTest.java
index b6427ca5b8..f79811d160 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilterTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/openapi/JobServiceModelFilterTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.openapi;
 
 import java.util.Arrays;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/BaseJobRepositoryTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/BaseJobRepositoryTest.java
index 6a19a75966..f992ca071c 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/BaseJobRepositoryTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/BaseJobRepositoryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.impl;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepositoryTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepositoryTest.java
index f3e49b6171..cb7f67f275 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepositoryTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepositoryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.impl;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshallerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshallerTest.java
index d99de3f056..a55eb1e8b9 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshallerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshallerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.marshaller;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshallerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshallerTest.java
index ac6879cb34..f9261c09a8 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshallerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshallerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.marshaller;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshallerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshallerTest.java
index 847b9e3389..82833ed7be 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshallerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.marshaller;
 
 import java.time.temporal.ChronoUnit;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java
index 5e6f9f2b94..835e7f25ea 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseJobResourceTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java
index bb10e274ac..d91a71402e 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java
index 241b594c59..58adb48605 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import java.io.IOException;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobResourceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobResourceTest.java
index e929fc04ee..596889dcde 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobResourceTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResourceIT.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResourceIT.java
index e4cd66de7e..54988a5aa6 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResourceIT.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResourceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakJobServiceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakJobServiceTest.java
index 3c9e4de9ba..04d3daf8b3 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakJobServiceTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakJobServiceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
index c7666366b5..01ee8db679 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import java.util.Collections;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/BaseJobResourceV2Test.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/BaseJobResourceV2Test.java
index 1fcec41dd6..7fb0e62a13 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/BaseJobResourceV2Test.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/BaseJobResourceV2Test.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2;
 
 import java.time.OffsetDateTime;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
index 61ccae4dc7..21c8e60d2c 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2;
 
 import java.util.Base64;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2Test.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2Test.java
index 3c728361ce..13822b791a 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2Test.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2Test.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.resource.v2;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java
index 3f86f36e56..914517a3bf 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.http.recipient;
 
 import java.time.OffsetDateTime;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java
index f6386ee7ad..bc3de59146 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
 
 import java.net.URI;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java
index 79ddb5cc45..08185b4ee6 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/BaseTimerJobSchedulerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManagerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManagerTest.java
index 06f0b14581..17d7b85282 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManagerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManagerTest.java
@@ -1,23 +1,27 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler;
 
 import java.time.ZonedDateTime;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 
 import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
@@ -38,14 +42,15 @@
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import io.quarkus.runtime.StartupEvent;
 import io.vertx.mutiny.core.Vertx;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -77,6 +82,8 @@ class JobSchedulerManagerTest {
 
     @BeforeEach
     void setUp() {
+        reset(tested);
+        reset(scheduler);
         this.scheduledJob = JobDetails
                 .builder()
                 .id(JOB_ID)
@@ -92,24 +99,14 @@ void setUp() {
                 .thenReturn(Optional.empty());
         lenient().when(scheduler.schedule(scheduledJob))
                 .thenReturn(ReactiveStreams.of(scheduledJob).buildRs());
-        tested.onMessagingStatusChange(new MessagingChangeEvent(true));
-    }
-
-    @Test
-    void testOnStartup(@Mock StartupEvent event) {
-        tested.onStartup(event);
-        verify(vertx).runOnContext(captorFirstExecution.capture());
-        verify(vertx).setPeriodic(eq(tested.loadJobIntervalInMinutes), captorPeriodic.capture());
-    }
-
-    @Test
-    void testOnStartupInvalidInterval(@Mock StartupEvent event) {
-        tested.schedulerChunkInMinutes = 10;
-        tested.loadJobIntervalInMinutes = 20;
-
-        tested.onStartup(event);
-
-        assertThat(tested.loadJobIntervalInMinutes).isEqualTo(tested.schedulerChunkInMinutes);
+        ArgumentCaptor<Runnable> action = ArgumentCaptor.forClass(Runnable.class);
+        lenient().doAnswer(a -> {
+            ((Runnable) a.getArgument(0)).run();
+            return a;
+        }).when(vertx).runOnContext(action.capture());
+        AtomicLong counter = new AtomicLong(1);
+        lenient().when(vertx.setPeriodic(anyLong(), any(Consumer.class))).thenReturn(counter.incrementAndGet());
+        tested.enabled.set(true);
     }
 
     @Test
@@ -125,4 +122,25 @@ void testLoadAlreadyJobDetailss() {
         tested.loadJobDetails();
         verify(scheduler, never()).schedule(scheduledJob);
     }
+
+    @Test
+    void onMessagingStatusChange() {
+        tested.enabled.set(false);
+        MessagingChangeEvent messagingChangeEvent = new MessagingChangeEvent(true);
+        tested.onMessagingStatusChange(messagingChangeEvent);
+        verify(tested).loadJobDetails();//called once
+        assertThat(tested.periodicTimerIdForLoadJobs.get()).isPositive();
+        assertThat(tested.enabled.get()).isTrue();
+
+        MessagingChangeEvent messagingChangeEventToFalse = new MessagingChangeEvent(false);
+        tested.onMessagingStatusChange(messagingChangeEventToFalse);
+        assertThat(tested.periodicTimerIdForLoadJobs.get()).isNegative();
+        assertThat(tested.enabled.get()).isFalse();
+        verify(tested).loadJobDetails();//still called once
+
+        tested.onMessagingStatusChange(messagingChangeEvent);
+        verify(tested, times(2)).loadJobDetails(); //called twice
+        assertThat(tested.periodicTimerIdForLoadJobs.get()).isPositive();
+        assertThat(tested.enabled.get()).isTrue();
+    }
 }
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java
index 1009f1aa8e..b6567ce0c8 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobSchedulerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler.impl;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceSchedulerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceSchedulerTest.java
index 5de07d4630..4f78502455 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceSchedulerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceSchedulerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.scheduler.impl;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/stream/AbstractJobStreamsTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/stream/AbstractJobStreamsTest.java
index 1ded9d564f..4295530a29 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/stream/AbstractJobStreamsTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/stream/AbstractJobStreamsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.stream;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/utils/DateUtilTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/utils/DateUtilTest.java
index 02f3b25664..d20fd2d1cc 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/utils/DateUtilTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/utils/DateUtilTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.utils;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobDetailsValidatorTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobDetailsValidatorTest.java
index bc7742dd06..31ffdf7afa 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobDetailsValidatorTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobDetailsValidatorTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.validation;
 
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobValidatorTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobValidatorTest.java
index 31862340f8..75226607db 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobValidatorTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/JobValidatorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.validation;
 
 import java.time.OffsetDateTime;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidatorTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidatorTest.java
index b32e8ac27d..1480365324 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidatorTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidatorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.validation;
 
 import java.util.Optional;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java
index 060bfdf795..a23589deba 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.validation;
 
 import java.util.Arrays;
diff --git a/jobs-service/jobs-service-common/src/test/resources/application.properties b/jobs-service/jobs-service-common/src/test/resources/application.properties
index 3090cf1020..24ef88d135 100644
--- a/jobs-service/jobs-service-common/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-common/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
 kogito.service.url=http://localhost:8080
@@ -16,4 +35,7 @@ quarkus.http.auth.permission.permit1.methods=GET
 %keycloak.quarkus.oidc.enabled=true
 %keycloak.quarkus.oidc.tenant-enabled=true
 %keycloak.quarkus.oidc.client-id=kogito-app
-%keycloak.quarkus.oidc.credentials.secret=secret
\ No newline at end of file
+%keycloak.quarkus.oidc.credentials.secret=secret
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/jobs-service/jobs-service-infinispan/docker/docker-compose.yaml b/jobs-service/jobs-service-infinispan/docker/docker-compose.yaml
index 9d02b0f6cd..e1a8abf91b 100644
--- a/jobs-service/jobs-service-infinispan/docker/docker-compose.yaml
+++ b/jobs-service/jobs-service-infinispan/docker/docker-compose.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: '2.1'
 
 services:
diff --git a/jobs-service/jobs-service-infinispan/docker/infinispan/groups.properties b/jobs-service/jobs-service-infinispan/docker/infinispan/groups.properties
index 6d22b52a7f..c5e283b5fd 100644
--- a/jobs-service/jobs-service-infinispan/docker/infinispan/groups.properties
+++ b/jobs-service/jobs-service-infinispan/docker/infinispan/groups.properties
@@ -1,16 +1,20 @@
-##
-#  Copyright 2020 Red Hat, Inc. and/or its affiliates.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-#        http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
+
 admin=admin
\ No newline at end of file
diff --git a/jobs-service/jobs-service-infinispan/docker/infinispan/infinispan.xml b/jobs-service/jobs-service-infinispan/docker/infinispan/infinispan.xml
index 30ccd63e2e..aad0577af0 100644
--- a/jobs-service/jobs-service-infinispan/docker/infinispan/infinispan.xml
+++ b/jobs-service/jobs-service-infinispan/docker/infinispan/infinispan.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <infinispan xmlns='urn:infinispan:config:10.0' xsi:schemaLocation='urn:infinispan:config:10.0 http://www.infinispan.org/schemas/infinispan-config-10.0.xsd urn:infinispan:server:10.0 http://www.infinispan.org/schemas/infinispan-server-10.0.xsd'
             xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
   <server xmlns='urn:infinispan:server:10.0'>
diff --git a/jobs-service/jobs-service-infinispan/docker/infinispan/users.properties b/jobs-service/jobs-service-infinispan/docker/infinispan/users.properties
index ab26fdd51b..c5e283b5fd 100644
--- a/jobs-service/jobs-service-infinispan/docker/infinispan/users.properties
+++ b/jobs-service/jobs-service-infinispan/docker/infinispan/users.properties
@@ -1 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 admin=admin
\ No newline at end of file
diff --git a/jobs-service/jobs-service-infinispan/pom.xml b/jobs-service/jobs-service-infinispan/pom.xml
index afa648ad45..60b87a0a3c 100644
--- a/jobs-service/jobs-service-infinispan/pom.xml
+++ b/jobs-service/jobs-service-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
index 16b28e3668..510c6038fe 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan;
 
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanInitialized.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanInitialized.java
index 2c7d6229cc..d00a3056f8 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanInitialized.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanInitialized.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan;
 
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
index 09094eb12d..b400dfddb6 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan;
 
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/BaseMarshaller.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/BaseMarshaller.java
index f0c1de9420..65917c2f18 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/BaseMarshaller.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/BaseMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
 
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/JobDetailsMarshaller.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/JobDetailsMarshaller.java
index da9d55b3c7..64d8e768a4 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/JobDetailsMarshaller.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/JobDetailsMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
 
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
index 06925a5809..3952c06b80 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
@@ -1,23 +1,29 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
 
+import java.io.IOException;
+
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
 
+import org.infinispan.protostream.FileDescriptorSource;
 import org.infinispan.protostream.MessageMarshaller;
 import org.kie.kogito.jobs.service.repository.marshaller.RecipientMarshaller;
 
@@ -33,4 +39,13 @@ public MessageMarshaller jobDetailsMarshaller(RecipientMarshaller recipientMarsh
     public MessageMarshaller triggerMarshaller() {
         return new TriggerMarshaller();
     }
+
+    @Produces
+    public FileDescriptorSource bookProtoDefinition() {
+        try {
+            return FileDescriptorSource.fromResources("META-INF/library.proto");
+        } catch (IOException e) {
+            return null;
+        }
+    }
 }
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshaller.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshaller.java
index d9407a4c24..836c916ef8 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshaller.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
 
diff --git a/jobs-service/jobs-service-infinispan/src/main/resources/META-INF/hotrod-client.properties b/jobs-service/jobs-service-infinispan/src/main/resources/META-INF/hotrod-client.properties
index 3943ddfdd7..d5a0146064 100644
--- a/jobs-service/jobs-service-infinispan/src/main/resources/META-INF/hotrod-client.properties
+++ b/jobs-service/jobs-service-infinispan/src/main/resources/META-INF/hotrod-client.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Docker 4 Mac workaround
 # infinispan.client.hotrod.client_intelligence=BASIC
 
diff --git a/jobs-service/jobs-service-infinispan/src/main/resources/application.properties b/jobs-service/jobs-service-infinispan/src/main/resources/application.properties
index ff1cb049de..eff249325f 100644
--- a/jobs-service/jobs-service-infinispan/src/main/resources/application.properties
+++ b/jobs-service/jobs-service-infinispan/src/main/resources/application.properties
@@ -1,17 +1,20 @@
 #
-# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #Infinispan - more specific configs on hotrod-client.properties file.
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
index d6ec16ab40..12c168e81c 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanEventSupportTestProfile.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanEventSupportTestProfile.java
index 32b051a9c5..09249791c2 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanEventSupportTestProfile.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanEventSupportTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import java.util.ArrayList;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanMessagingApiTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanMessagingApiTest.java
index b0e2f3f542..8c1ed72b7e 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanMessagingApiTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanMessagingApiTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
index 8fcf1199ac..3d477730a6 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan;
 
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
index fd647ce6c9..54dd96b1d8 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.infinispan;
 
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshallerTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshallerTest.java
index 792af9f0e4..28807fad35 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshallerTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/TriggerMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
 
 import java.io.IOException;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/InfinispanJobResourceTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/InfinispanJobResourceTest.java
index 8b13ff5881..2965393c93 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/InfinispanJobResourceTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/InfinispanJobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInfinispanJobServiceTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInfinispanJobServiceTest.java
index c7f96a3eed..2964fc30b9 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInfinispanJobServiceTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInfinispanJobServiceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
index 51b19add0e..97f07e4456 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import java.util.Arrays;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InfinispanHttpRecipientPayloadTypesTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InfinispanHttpRecipientPayloadTypesTest.java
index 02ed033c5a..fd7ea4fce2 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InfinispanHttpRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InfinispanHttpRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.http.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InfinispanSinkRecipientPayloadTypesTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InfinispanSinkRecipientPayloadTypesTest.java
index 0af5082cda..1193226b7d 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InfinispanSinkRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InfinispanSinkRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-infinispan/src/test/resources/application.properties b/jobs-service/jobs-service-infinispan/src/test/resources/application.properties
index 19bd0c8415..cea17e1e2a 100644
--- a/jobs-service/jobs-service-infinispan/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-infinispan/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
 kogito.service.url=http://localhost:8080
diff --git a/jobs-service/jobs-service-inmemory/pom.xml b/jobs-service/jobs-service-inmemory/pom.xml
index 00af80d7f7..e814f101ea 100644
--- a/jobs-service/jobs-service-inmemory/pom.xml
+++ b/jobs-service/jobs-service-inmemory/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-inmemory/src/main/resources/application.properties b/jobs-service/jobs-service-inmemory/src/main/resources/application.properties
index 7809001877..c3c12a4145 100644
--- a/jobs-service/jobs-service-inmemory/src/main/resources/application.properties
+++ b/jobs-service/jobs-service-inmemory/src/main/resources/application.properties
@@ -1,17 +1,20 @@
 #
-# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 quarkus.datasource.db-kind=postgresql
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
index b477f9eb8e..82d8b7f43f 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryEventsSupportTestProfile.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryEventsSupportTestProfile.java
index d281398810..a5900350b0 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryEventsSupportTestProfile.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryEventsSupportTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 public class InMemoryEventsSupportTestProfile extends BaseEventsSupportTestProfile {
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryMessagingApiTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryMessagingApiTest.java
index ed23cdf253..a8a392506b 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryMessagingApiTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryMessagingApiTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
index 4459489513..ee59162e2a 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.inmemory.postgresql;
 
 import java.time.Duration;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/InmemoryPostgreSqlJobResourceTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/InmemoryPostgreSqlJobResourceTest.java
index 86ce725c2a..96da661c63 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/InmemoryPostgreSqlJobResourceTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/InmemoryPostgreSqlJobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInmemoryPostgreSqlJobResourceTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInmemoryPostgreSqlJobResourceTest.java
index 0e2579020b..d1d4b4e221 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInmemoryPostgreSqlJobResourceTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakInmemoryPostgreSqlJobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InmemoryHttpRecipientPayloadTypesTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InmemoryHttpRecipientPayloadTypesTest.java
index d94cbaf517..45a70456ab 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InmemoryHttpRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/InmemoryHttpRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.http.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InmemorySinkRecipientPayloadTypesTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InmemorySinkRecipientPayloadTypesTest.java
index 6113e6aa92..7af6005261 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InmemorySinkRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/InmemorySinkRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-inmemory/src/test/resources/application.properties b/jobs-service/jobs-service-inmemory/src/test/resources/application.properties
index 32a1b76510..9525c74b31 100644
--- a/jobs-service/jobs-service-inmemory/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-inmemory/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.test-port=0
 # Outgoing events for the event based API integration tests
 %kafka-events-support.mp.messaging.outgoing.kogito-job-service-job-request-events-emitter.connector=smallrye-kafka
diff --git a/jobs-service/jobs-service-internal-api/pom.xml b/jobs-service/jobs-service-internal-api/pom.xml
index e92cb75e15..8f6418b78d 100644
--- a/jobs-service/jobs-service-internal-api/pom.xml
+++ b/jobs-service/jobs-service-internal-api/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapter.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapter.java
index bd1beb893d..3149da7977 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapter.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.adapter;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapter.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapter.java
index de86b76f2b..7da47198fb 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapter.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.adapter;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobExecutionException.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobExecutionException.java
index 31fd559b49..3a65ab42ed 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobExecutionException.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobExecutionException.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.exception;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobServiceException.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobServiceException.java
index db11ced742..d192c24110 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobServiceException.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/exception/JobServiceException.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.exception;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutor.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutor.java
index 20c6a32f4a..236a802927 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutor.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutor.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.executor;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutorResolver.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutorResolver.java
index edd7d4cb4b..9d67009d17 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutorResolver.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/executor/JobExecutorResolver.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.executor;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetails.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetails.java
index 55a40b4ffe..afa397a07d 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetails.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetails.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsBuilder.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsBuilder.java
index 02abd55a11..832ed1ee12 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsBuilder.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsContext.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsContext.java
index 90288afa25..38fc486757 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsContext.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobDetailsContext.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobExecutionResponse.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobExecutionResponse.java
index bcb1061bee..575e5123fb 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobExecutionResponse.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobExecutionResponse.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobServiceManagementInfo.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobServiceManagementInfo.java
index 08d8d10c65..24e3e86a15 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobServiceManagementInfo.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobServiceManagementInfo.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobStatus.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobStatus.java
index 272ae70de4..9514759bd0 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobStatus.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/JobStatus.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ManageableJobHandle.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ManageableJobHandle.java
index 4e6f3213b6..4afb44a4eb 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ManageableJobHandle.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ManageableJobHandle.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/Recipient.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/Recipient.java
index 22bbacc2f6..0fca466b7c 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/Recipient.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/Recipient.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/RecipientInstance.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/RecipientInstance.java
index b6752650e5..7ca0dd0cba 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/RecipientInstance.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/RecipientInstance.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ScheduledJob.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ScheduledJob.java
index 95fd6a4949..4eb5688177 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ScheduledJob.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/model/ScheduledJob.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.model;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/DateUtil.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/DateUtil.java
index d852789a2f..11a7d9f244 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/DateUtil.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/DateUtil.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.utils;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/ModelUtil.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/ModelUtil.java
index 8725573698..23353e68d1 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/ModelUtil.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/utils/ModelUtil.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.utils;
 
 import java.time.temporal.ChronoUnit;
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidator.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidator.java
index 3dc15f30f5..066a34b64b 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidator.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidator.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.validation;
 
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidationException.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidationException.java
index 8a44d9b55e..b87123d0ca 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidationException.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidationException.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.validation;
 
 public class ValidationException extends RuntimeException {
diff --git a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidatorContext.java b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidatorContext.java
index e724444b75..a9ca2b7660 100644
--- a/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidatorContext.java
+++ b/jobs-service/jobs-service-internal-api/src/main/java/org/kie/kogito/jobs/service/validation/ValidatorContext.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.validation;
 
 import org.kie.kogito.jobs.service.api.Job;
diff --git a/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapterTest.java b/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapterTest.java
index ec7e31d6e1..55fc5d00ef 100644
--- a/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapterTest.java
+++ b/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/JobDetailsAdapterTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.adapter;
 
 import java.time.OffsetDateTime;
diff --git a/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapterTest.java b/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapterTest.java
index 309a1856a8..eebbfb9a46 100644
--- a/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapterTest.java
+++ b/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/adapter/ScheduledJobAdapterTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.adapter;
 
diff --git a/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/utils/ModelUtilTest.java b/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/utils/ModelUtilTest.java
index 4a93bee095..cfb2956dd4 100644
--- a/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/utils/ModelUtilTest.java
+++ b/jobs-service/jobs-service-internal-api/src/test/java/org/kie/kogito/jobs/service/utils/ModelUtilTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.utils;
 
 import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-service-messaging-http/pom.xml b/jobs-service/jobs-service-messaging-http/pom.xml
index f3f761cdf3..040d716364 100644
--- a/jobs-service/jobs-service-messaging-http/pom.xml
+++ b/jobs-service/jobs-service-messaging-http/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
index 0aed5951d1..5e151206c9 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.http;
 
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
index e16e2cbb6a..e52c40aac5 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.http;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
index f0ac31a7a3..6c11b0777f 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.http.health.knative;
 
 import java.net.InetAddress;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
index 33e5758855..4119e75682 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.http.stream;
 
 import java.util.Optional;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
index 9ec17fda78..ceb2cbf42f 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.http.v2;
 
diff --git a/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/beans.xml b/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/beans.xml
+++ b/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/microprofile-config.properties b/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/microprofile-config.properties
index ef288a15fa..15b8e6a9b0 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/microprofile-config.properties
+++ b/jobs-service/jobs-service-messaging-http/src/main/resources/META-INF/microprofile-config.properties
@@ -1,17 +1,20 @@
 #
-# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # This file contains the default configurations for the Quarkus http connector.
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
index 6105af82fc..61b6dee7f6 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.http;
 
 import java.net.URI;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumerTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumerTest.java
index 91770d9af6..9fa05e680f 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumerTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.http;
 
 import org.kie.kogito.jobs.service.messaging.ReactiveMessagingEventConsumerTest;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheckTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheckTest.java
index 0193234312..8aedd82ad0 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheckTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheckTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.http.health.knative;
 
 import java.util.function.UnaryOperator;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
index e778e6f992..6fc2836a25 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.http.stream;
 
 import java.util.Optional;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumerTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumerTest.java
index 0cfd470a3e..418afc6a21 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumerTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.http.v2;
 
diff --git a/jobs-service/jobs-service-messaging-kafka/pom.xml b/jobs-service/jobs-service-messaging-kafka/pom.xml
index 382464f528..4dfeb9c6da 100644
--- a/jobs-service/jobs-service-messaging-kafka/pom.xml
+++ b/jobs-service/jobs-service-messaging-kafka/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializer.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializer.java
index cfcef36fc0..45f9604f80 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializer.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.kafka;
 
 import io.cloudevents.CloudEvent;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
index c36e80a1b0..232c0fb3c2 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.kafka;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
index 24e8e42db7..90f2017c74 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.kafka;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
index 3eed9b1921..1c428782ff 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.kafka.stream;
 
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
index f582b70824..9f852778a8 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.kafka.stream;
 
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
index 78f08c566b..e209fd759d 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.kafka.v2;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/beans.xml b/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/beans.xml
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/microprofile-config.properties b/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/microprofile-config.properties
index d77ff06a6b..c8e84c2e74 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/microprofile-config.properties
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/resources/META-INF/microprofile-config.properties
@@ -1,17 +1,20 @@
 #
-# Copyright 2023 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # This file contains the default configurations for Kafka.
diff --git a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializerTest.java b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializerTest.java
index 429bac3183..cc9f6ee7a0 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializerTest.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/CloudEventDeserializerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.kafka;
 
 import java.net.URI;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumerTest.java b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumerTest.java
index 9a974001c5..42cc7d85c7 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumerTest.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.kafka;
 
 import org.kie.kogito.jobs.service.messaging.ReactiveMessagingEventConsumerTest;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
index 7a8e75f2ca..fc3cfa3556 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.kafka.stream;
 
diff --git a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreamsTest.java b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreamsTest.java
index fba26f6f95..a0dbc6c95d 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreamsTest.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreamsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging.kafka.stream;
 
 import java.util.Optional;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumerTest.java b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumerTest.java
index 1965cf60f2..053c058094 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumerTest.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.messaging.kafka.v2;
 
diff --git a/jobs-service/jobs-service-mongodb/pom.xml b/jobs-service/jobs-service-mongodb/pom.xml
index ba120b9768..ebe22617f3 100644
--- a/jobs-service/jobs-service-mongodb/pom.xml
+++ b/jobs-service/jobs-service-mongodb/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
index 273bd972a3..3e18c05b7c 100644
--- a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
+++ b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.mongodb;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
index 28ee60bb66..869d921d5a 100644
--- a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
+++ b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.mongodb.marshaller;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-mongodb/src/main/resources/application.properties b/jobs-service/jobs-service-mongodb/src/main/resources/application.properties
index 62455036ad..b16753b9a3 100644
--- a/jobs-service/jobs-service-mongodb/src/main/resources/application.properties
+++ b/jobs-service/jobs-service-mongodb/src/main/resources/application.properties
@@ -1,17 +1,20 @@
 #
-# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 quarkus.mongodb.connection-string=
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
index 77c3dec7b0..0907fa3720 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBEventSupportTestProfile.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBEventSupportTestProfile.java
index e1f920f882..94da02a133 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBEventSupportTestProfile.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBEventSupportTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import java.util.ArrayList;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBMessagingApiTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBMessagingApiTest.java
index 9b84ac9a04..e425626ecd 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBMessagingApiTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBMessagingApiTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java
index 388a82566b..bd92b95a5c 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryExecutionTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.mongodb;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
index 354b12025e..d084da7dfe 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.mongodb;
 
 import java.time.Duration;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshallerTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshallerTest.java
index 5ff313dff1..950e3d66fd 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshallerTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.mongodb.marshaller;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakMongoDBJobServiceTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakMongoDBJobServiceTest.java
index b0964fce9c..bfe0190353 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakMongoDBJobServiceTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakMongoDBJobServiceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
index 6ba8447f84..57fba16c51 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import java.util.Arrays;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/MongoDBJobResourceTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/MongoDBJobResourceTest.java
index 9b4895f898..c0e1f44cda 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/MongoDBJobResourceTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/MongoDBJobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import org.kie.kogito.testcontainers.quarkus.MongoDBQuarkusTestResource;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/MongoDBHttpRecipientPayloadTypesTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/MongoDBHttpRecipientPayloadTypesTest.java
index dc804a9add..b80568c582 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/MongoDBHttpRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/MongoDBHttpRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.http.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/MongoDBSinkRecipientPayloadTypesTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/MongoDBSinkRecipientPayloadTypesTest.java
index dae67ffa70..2eb71206a8 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/MongoDBSinkRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/MongoDBSinkRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-mongodb/src/test/resources/application.properties b/jobs-service/jobs-service-mongodb/src/test/resources/application.properties
index 3ac740567b..75d5c092e8 100644
--- a/jobs-service/jobs-service-mongodb/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-mongodb/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
 kogito.service.url=http://localhost:8080
diff --git a/jobs-service/jobs-service-postgresql-common/pom.xml b/jobs-service/jobs-service-postgresql-common/pom.xml
index 87e4dffd70..4f7550a541 100644
--- a/jobs-service/jobs-service-postgresql-common/pom.xml
+++ b/jobs-service/jobs-service-postgresql-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
index a042969d42..9a1fc1794f 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
+++ b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.postgresql;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
index 105b644d25..1f617472a1 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
+++ b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.postgresql;
 
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/beans.xml b/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/beans.xml
+++ b/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/application.properties b/jobs-service/jobs-service-postgresql-common/src/main/resources/application.properties
index b48dada46c..a73ec31a9c 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/resources/application.properties
+++ b/jobs-service/jobs-service-postgresql-common/src/main/resources/application.properties
@@ -1,16 +1,20 @@
 #
-# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
+
 quarkus.datasource.db-kind=postgresql
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryExecutionTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryExecutionTest.java
index 94cdfde6ea..8d40032982 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryExecutionTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryExecutionTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.postgresql;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
index 2d7674c3c4..6f2d6244b8 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.repository.postgresql;
 
 import java.time.Duration;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
index 085655d6d1..569f92ee9b 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.jobs.service.repository.postgresql;
 
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakPostgreSqlJobResourceTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakPostgreSqlJobResourceTest.java
index c4389f044d..df2bcfd175 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakPostgreSqlJobResourceTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakPostgreSqlJobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
index d074816a51..599af3f9e4 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/KeycloakQuarkusTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import java.util.Arrays;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/PostgreSqlJobResourceTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/PostgreSqlJobResourceTest.java
index 9cb256a076..dc9cbe09f9 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/PostgreSqlJobResourceTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/PostgreSqlJobResourceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource;
 
 import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/PostgreSqlJobResourceV2Test.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/PostgreSqlJobResourceV2Test.java
index 843959c82d..b2c76555cb 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/PostgreSqlJobResourceV2Test.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/PostgreSqlJobResourceV2Test.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2;
 
 import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/PostgreSqlHttpRecipientPayloadTypesTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/PostgreSqlHttpRecipientPayloadTypesTest.java
index b450557ccf..ef852764ad 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/PostgreSqlHttpRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/PostgreSqlHttpRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.http.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/PostgreSqlSinkRecipientPayloadTypesTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/PostgreSqlSinkRecipientPayloadTypesTest.java
index 92ee8bb469..45d3920c19 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/PostgreSqlSinkRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/PostgreSqlSinkRecipientPayloadTypesTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
 
 import org.kie.kogito.jobs.service.resource.v2.ExternalResourcesMock;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties b/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties
index 0ebda5a108..9c0e69df9c 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
 kogito.service.url=http://localhost:8080
diff --git a/jobs-service/jobs-service-postgresql/pom.xml b/jobs-service/jobs-service-postgresql/pom.xml
index 67f17e3dee..a884eb2866 100644
--- a/jobs-service/jobs-service-postgresql/pom.xml
+++ b/jobs-service/jobs-service-postgresql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/jobs-service/jobs-service-postgresql/src/main/resources/META-INF/beans.xml b/jobs-service/jobs-service-postgresql/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jobs-service/jobs-service-postgresql/src/main/resources/META-INF/beans.xml
+++ b/jobs-service/jobs-service-postgresql/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jobs-service/jobs-service-postgresql/src/main/resources/application.properties b/jobs-service/jobs-service-postgresql/src/main/resources/application.properties
index c3ef64ad72..4dc2184d4d 100644
--- a/jobs-service/jobs-service-postgresql/src/main/resources/application.properties
+++ b/jobs-service/jobs-service-postgresql/src/main/resources/application.properties
@@ -1,17 +1,20 @@
 #
-# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 quarkus.datasource.db-kind=postgresql
diff --git a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
index d6ea60277b..dbc11be229 100644
--- a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
+++ b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlEventSupportTestProfile.java b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlEventSupportTestProfile.java
index 72b4fd73ac..2042c4ca65 100644
--- a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlEventSupportTestProfile.java
+++ b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlEventSupportTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import java.util.ArrayList;
diff --git a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlMessagingApiTest.java b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlMessagingApiTest.java
index ceeb764de5..f3021fbcb7 100644
--- a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlMessagingApiTest.java
+++ b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlMessagingApiTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.jobs.service.messaging;
 
 import io.quarkus.test.junit.QuarkusTest;
diff --git a/jobs-service/jobs-service-postgresql/src/test/resources/application.properties b/jobs-service/jobs-service-postgresql/src/test/resources/application.properties
index efc9215c21..15110b282c 100644
--- a/jobs-service/jobs-service-postgresql/src/test/resources/application.properties
+++ b/jobs-service/jobs-service-postgresql/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
 kogito.service.url=http://localhost:8080
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml
index 8d8e911c27..d9110cf0ea 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java
index 631bfab9a3..e2df73e3cc 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.addons.quarkus.jobs.service.embedded.deployment;
 
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java
index f4100bc3ce..220d923f20 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.addons.quarkus.jobs.service.embedded.deployment;
 
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml
index ece361615e..8d417bfc2d 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
index 62b9d5db9a..ea8fe22c35 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java
index 44b597f6c4..beb55947a2 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.jobs.service.embedded;
 
 import java.util.HashMap;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.java
index 1d746cd5c2..0f077459a5 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.jobs.service.embedded;
 
 import io.quarkus.runtime.annotations.ConfigItem;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
index 3e64c6df7a..9901ca4ffa 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.jobs.service.embedded.stream;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/beans.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/beans.xml
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 7aa9f39bf7..76d650d377 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Jobs Service Embedded Quarkus Addon
 description: Run Jobs Service embedded with the application.
 metadata:
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/application.properties b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/application.properties
index 4cb7a5ef22..c1852d00aa 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/application.properties
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 %dev.quarkus.log.category."org.kie.kogito.jobs".level=INFO
 
 quarkus.datasource.jobs_service.db-kind=postgresql
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
index 361aa9932e..c098cd2d87 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.addons.quarkus.jobs.service.embedded.stream;
 
 import java.time.ZonedDateTime;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherMock.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherMock.java
index 3d43d14d4c..f9a3790d59 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherMock.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/index/addon/DataIndexEventPublisherMock.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.index.addon;
 
 import java.util.Collection;
diff --git a/jobs-service/kogito-addons-jobs-service/pom.xml b/jobs-service/kogito-addons-jobs-service/pom.xml
index 5f80d5a6f6..e4e084acbd 100644
--- a/jobs-service/kogito-addons-jobs-service/pom.xml
+++ b/jobs-service/kogito-addons-jobs-service/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
     <modelVersion>4.0.0</modelVersion>
diff --git a/jobs-service/pom.xml b/jobs-service/pom.xml
index 1f8f4dab3a..3efddd3e08 100644
--- a/jobs-service/pom.xml
+++ b/jobs-service/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
diff --git a/kogito-apps-bom/pom.xml b/kogito-apps-bom/pom.xml
index 04fc9b5dc7..528a28ffe0 100644
--- a/kogito-apps-bom/pom.xml
+++ b/kogito-apps-bom/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml
index e4fc8b6834..60a28dbe47 100644
--- a/kogito-apps-build-parent/pom.xml
+++ b/kogito-apps-build-parent/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml
index eb841d08f6..20b5806d47 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
@@ -113,7 +133,11 @@
               <outputDirectory>${basedir}/target/classes/dev-static/webapp</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${path.to.webapp.app}/dist</directory>
+                  <directory>${path.to.webapp.app}/dist/resources/webapp</directory>
+                  <filtering>false</filtering>
+                </resource>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/webapp</directory>
                   <filtering>false</filtering>
                 </resource>
               </resources>
@@ -135,8 +159,6 @@
                     <include>form-displayer.js</include>
                     <include>serverless-workflow-combined-editor-envelope.html</include>
                     <include>serverless-workflow-combined-editor-envelope.js</include>
-                    <include>serverless-workflow-mermaid-viewer-envelope.html</include>
-                    <include>serverless-workflow-mermaid-viewer-envelope.js</include>
                     <include>serverless-workflow-text-editor-envelope.html</include>
                     <include>serverless-workflow-text-editor-envelope.js</include>
                     <include>serverless-workflow-diagram-editor-envelope.html</include>
@@ -144,8 +166,8 @@
                   </includes>
                 </resource>
                 <!--copy diagram into the dev-static-->
-                 <resource>
-                  <directory>${path.to.webapp.app}/dist</directory>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/resources</directory>
                   <includes>
                     <include>diagram/</include>
                   </includes>
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java
index 58c331a87e..93b58135df 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.deployment;
 
 import java.io.IOException;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java
index 76460b0aac..e6908ca5a6 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/ServerlessWorkflowQuarkusExtensionProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html
index 9621216c66..d61c149e66 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/embedded.html
@@ -1,55 +1,58 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 {#if info:isDataIndexAvailable}
 <a href="{urlbase}/workflowInstances" class="badge badge-light">
-    <i class="fa fa-project-diagram fa-fw"></i>
-    Workflow Instances <span id="workflowInstancesCount" class="badge badge-light"/>
+  <i class="fa fa-project-diagram fa-fw"></i>
+  Workflow Instances
+  <span id="workflowInstancesCount" class="badge badge-light" />
 </a>
 <a href="{urlbase}/monitoring" class="badge badge-light">
-    <i class="fa fa-tachometer fa-fw"></i>
-    Monitoring
+  <i class="fa fa-tachometer fa-fw"></i>
+  Monitoring
 </a>
-{/if}
-{#if info:isDataIndexAvailable == false}
+{/if} {#if info:isDataIndexAvailable == false}
 <p>No Kogito addons detected.</p>
-{/if}
-{#if info:isDataIndexAvailable}
+{/if} {#if info:isDataIndexAvailable}
 <script>
-    const graphqlUrl = "{config:property('kogito.data-index.url') ?: ''}/graphql";
+  const graphqlUrl = "{config:property('kogito.data-index.url') ?: ''}/graphql";
 
-    {|
-        const fillCount = () => {
-            fetch(graphqlUrl, {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                    Accept: "application/json",
-                },
-                body: JSON.stringify({query: "query getAllProcessesIds{  ProcessInstances{ id } }"}),
-            })
-                .then(r => r.json())
-                .then(json => $("#workflowInstancesCount").text(json.data.ProcessInstances.length))
-                .catch(error => {
-                    console.log("Error while trying to fetch workflow instances count.");
-                    console.error(error);
-                });
-        };
+  {|
+      const fillCount = () => {
+          fetch(graphqlUrl, {
+              method: "POST",
+              headers: {
+                  "Content-Type": "application/json",
+                  Accept: "application/json",
+              },
+              body: JSON.stringify({query: "query getAllProcessesIds{  ProcessInstances{ id } }"}),
+          })
+              .then(r => r.json())
+              .then(json => $("#workflowInstancesCount").text(json.data.ProcessInstances.length))
+              .catch(error => {
+                  console.log("Error while trying to fetch workflow instances count.");
+                  console.error(error);
+              });
+      };
 
-        fillCount();
-    |}
+      fillCount();
+  |}
 </script>
 {/if}
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html
index f3da460685..160e99fbb3 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html
@@ -1,55 +1,47 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-#envelope-app {
-    width: 100vw;
-    height: calc(100vh - 98px);
-}
-{/style}
-{#title}Runtime UI{/title}
-{#body}
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+#envelope-app { width: 100vw; height: calc(100vh - 98px); } {/style}
+{#title}Runtime UI{/title} {#body}
 <div id="envelope-app"></div>
 
 <script src="resources/webapp/standalone.js"></script>
 <script>
-    const devUI = RuntimeToolsDevUI.open({
-        container: document.getElementById("envelope-app"),
-        isDataIndexAvailable: {info:isDataIndexAvailable},
-        dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
-        page: "Monitoring",
-        devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
-        openApiPath: "q/openapi.json",
-        availablePages: ["Processes", "Monitoring", "CustomDashboard"],
-        customLabels: {
-            singularProcessLabel: "Workflow",
-            pluralProcessLabel: "Workflows"
-        },
-        omittedProcessTimelineEvents: ["EmbeddedStart", "EmbeddedEnd", "Script"],
-        diagramPreviewSize: {
-            width: 1000,
-            height: 1000
-        },
-        isStunnerEnabled: {config:property('kogito.swf.stunner.enabled') ?: true}
-    })
+  const devUI = RuntimeToolsDevUI.open({
+      container: document.getElementById("envelope-app"),
+      isDataIndexAvailable: {info:isDataIndexAvailable},
+      dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
+      page: "Monitoring",
+      devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
+      openApiPath: "q/openapi.json",
+      availablePages: ["Processes", "Monitoring", "CustomDashboard"],
+      customLabels: {
+          singularProcessLabel: "Workflow",
+          pluralProcessLabel: "Workflows"
+      },
+      omittedProcessTimelineEvents: ["EmbeddedStart", "EmbeddedEnd", "Script"],
+      diagramPreviewSize: {
+          width: 1000,
+          height: 1000
+      }
+  })
 </script>
-{/body}
-{/include}
+{/body} {/include}
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html
index ecfdc6a57d..20024126b0 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html
@@ -1,55 +1,47 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-#envelope-app {
-    width: 100vw;
-    height: calc(100vh - 98px);
-}
-{/style}
-{#title}Runtime UI{/title}
-{#body}
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+#envelope-app { width: 100vw; height: calc(100vh - 98px); } {/style}
+{#title}Runtime UI{/title} {#body}
 <div id="envelope-app"></div>
 
 <script src="resources/webapp/standalone.js"></script>
 <script>
-    const devUI = RuntimeToolsDevUI.open({
-        container: document.getElementById("envelope-app"),
-        isDataIndexAvailable: {info:isDataIndexAvailable},
-        dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
-        page: "Processes",
-        devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
-        openApiPath: "q/openapi.json",
-        availablePages: ["Processes", "Monitoring", "CustomDashboard"],
-        customLabels: {
-            singularProcessLabel: "Workflow",
-            pluralProcessLabel: "Workflows"
-        },
-        omittedProcessTimelineEvents: ["EmbeddedStart", "EmbeddedEnd", "Script"],
-        diagramPreviewSize: {
-            width: 1000,
-            height: 1000
-        },
-        isStunnerEnabled: {config:property('kogito.swf.stunner.enabled') ?: true}
-    })
+  const devUI = RuntimeToolsDevUI.open({
+      container: document.getElementById("envelope-app"),
+      isDataIndexAvailable: {info:isDataIndexAvailable},
+      dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
+      page: "Processes",
+      devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
+      openApiPath: "q/openapi.json",
+      availablePages: ["Processes", "Monitoring", "CustomDashboard"],
+      customLabels: {
+          singularProcessLabel: "Workflow",
+          pluralProcessLabel: "Workflows"
+      },
+      omittedProcessTimelineEvents: ["EmbeddedStart", "EmbeddedEnd", "Script"],
+      diagramPreviewSize: {
+          width: 1000,
+          height: 1000
+      }
+  })
 </script>
-{/body}
-{/include}
+{/body} {/include}
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
index fedaf09a6a..64c87c3990 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
index 27f4521fc0..3f7398b444 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard;
 
 import javax.inject.Inject;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java
index a21dc56e92..7d9c3a3d21 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard;
 
 import java.io.IOException;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
index 535536b682..9e7340b377 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard.converter;
 
 import java.util.Collections;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
index 92f881096b..45de74a778 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard.converter;
 
 import java.lang.annotation.Annotation;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
index 6062b8c35a..e6cd0387c4 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard.impl;
 
 import java.io.File;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java
index 7667c9e3d6..d3982535ce 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardFilter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard.model;
 
 import java.util.ArrayList;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java
index 098f8b4aa6..a7f80ac6af 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/model/CustomDashboardInfo.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard.model;
 
 import java.time.LocalDateTime;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/beans.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/beans.xml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml
index 2670eb0c9a..24d5c4be1e 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Serverless Workflow Tools
 metadata:
   keywords:
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java
index 57a4a05fb0..88a398014a 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard.impl;
 
 import java.io.File;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java
index a82d83c8ed..a901f73229 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.swf.tools.custom.dashboard.impl;
 
 import java.io.File;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml
index 88e26858b5..ea685a0b5c 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/products.dash.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 datasets:
   - uuid: products
     content: >-
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml
index b6a5fe7278..011aff8684 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/test/resources/custom/dashboards/subdir/age.dash.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 datasets:
   - uuid: age
     content: >-
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml
index 462bf7377b..4c2f65d362 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/pom.xml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <parent>
diff --git a/management-console/pom.xml b/management-console/pom.xml
index a552b3b023..0a18733992 100644
--- a/management-console/pom.xml
+++ b/management-console/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">
 
diff --git a/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java b/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
index 8f87e4e565..827b4dea18 100644
--- a/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
+++ b/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.mgmt;
 
diff --git a/management-console/src/main/resources/application.properties b/management-console/src/main/resources/application.properties
index 8fcd086d61..17cdb19e50 100644
--- a/management-console/src/main/resources/application.properties
+++ b/management-console/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 kogito.dataindex.http.url=http://localhost:8180/graphql
 #keycloak client config
diff --git a/management-console/src/main/resources/templates/index.html b/management-console/src/main/resources/templates/index.html
index 8683e0ffb9..94b0e6bc19 100755
--- a/management-console/src/main/resources/templates/index.html
+++ b/management-console/src/main/resources/templates/index.html
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
   <head>
@@ -18,7 +38,7 @@
   </script>
   <body class="pf-m-redhat-font">
     <noscript>Enabling JavaScript is required to run this app.</noscript>
-    <div id="root" style="height: 100%;"></div>
+    <div id="root" style="height: 100%"></div>
     <script type="text/javascript" src="/app.bundle.js"></script>
   </body>
 </html>
diff --git a/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java b/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
index d8dd90c913..62f2d796b5 100644
--- a/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
+++ b/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.mgmt;
 
diff --git a/management-console/src/test/java/org/kie/kogito/mgmt/StaticContentIT.java b/management-console/src/test/java/org/kie/kogito/mgmt/StaticContentIT.java
index 832bc24eaf..d8aed0c8e3 100644
--- a/management-console/src/test/java/org/kie/kogito/mgmt/StaticContentIT.java
+++ b/management-console/src/test/java/org/kie/kogito/mgmt/StaticContentIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.mgmt;
 
diff --git a/management-console/src/test/java/org/kie/kogito/mgmt/VertxRouterIT.java b/management-console/src/test/java/org/kie/kogito/mgmt/VertxRouterIT.java
index dfacd57d27..b2198382db 100644
--- a/management-console/src/test/java/org/kie/kogito/mgmt/VertxRouterIT.java
+++ b/management-console/src/test/java/org/kie/kogito/mgmt/VertxRouterIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.mgmt;
 
diff --git a/persistence-commons/kogito-ddl/pom.xml b/persistence-commons/kogito-ddl/pom.xml
index 17cb63cc6f..3946f15696 100644
--- a/persistence-commons/kogito-ddl/pom.xml
+++ b/persistence-commons/kogito-ddl/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
index 6d87cc723a..219e73bf1e 100644
--- a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
+++ b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
diff --git a/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
index 68cf514b1b..2acf8a56b6 100644
--- a/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
+++ b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
diff --git a/persistence-commons/persistence-commons-api/pom.xml b/persistence-commons/persistence-commons-api/pom.xml
index 89a640c75c..c1e7fbf479 100644
--- a/persistence-commons/persistence-commons-api/pom.xml
+++ b/persistence-commons/persistence-commons-api/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/Storage.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/Storage.java
index ff7856f414..ad9b856660 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/Storage.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/Storage.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/StorageService.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/StorageService.java
index 8952bbcdc0..85ad96fc91 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/StorageService.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/StorageService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api;
 
 public interface StorageService {
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/factory/Constants.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/factory/Constants.java
index b57bd87583..ca5e36a4de 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/factory/Constants.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/factory/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.factory;
 
 public class Constants {
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/AttributeDescriptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/AttributeDescriptor.java
index a51235f14d..f2bec52f78 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/AttributeDescriptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/AttributeDescriptor.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.proto;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainDescriptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainDescriptor.java
index 3f9ae54382..dcde9cb999 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainDescriptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainDescriptor.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.proto;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainModelRegisteredEvent.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainModelRegisteredEvent.java
index b7fd9e1db9..575ec0abf4 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainModelRegisteredEvent.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/proto/DomainModelRegisteredEvent.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.proto;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeFilter.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeFilter.java
index f26fd1684d..a7427ba8eb 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeFilter.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeFilter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.query;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeSort.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeSort.java
index 56169062d2..4c7edca530 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeSort.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/AttributeSort.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.query;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/FilterCondition.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/FilterCondition.java
index cdfcb25ba4..5cece3ed6c 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/FilterCondition.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/FilterCondition.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.query;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/Query.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/Query.java
index b1b8d8eafd..1232444f30 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/Query.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/Query.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.query;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/QueryFilterFactory.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/QueryFilterFactory.java
index 050a7c2ead..a54f58919a 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/QueryFilterFactory.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/QueryFilterFactory.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.query;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/SortDirection.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/SortDirection.java
index f89bd650ac..6ef721625e 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/SortDirection.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/query/SortDirection.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.api.query;
 
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/AttributeDescriptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/AttributeDescriptor.java
index b4ca15d888..89e46be229 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/AttributeDescriptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/AttributeDescriptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/EntityIndexDescriptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/EntityIndexDescriptor.java
index 789f35bdc9..39abd20eb0 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/EntityIndexDescriptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/EntityIndexDescriptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/IndexDescriptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/IndexDescriptor.java
index 92b1910ed6..d6c641eb94 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/IndexDescriptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/IndexDescriptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/ProcessDescriptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/ProcessDescriptor.java
index dcee0f8477..bf65079984 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/ProcessDescriptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/ProcessDescriptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaAcceptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaAcceptor.java
index 5877a43c0a..b512f4155b 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaAcceptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaAcceptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 public interface SchemaAcceptor {
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaDescriptor.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaDescriptor.java
index ad6101ef9d..e2c511c3b2 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaDescriptor.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaDescriptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 import java.util.Map;
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegisteredEvent.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegisteredEvent.java
index bf31f74630..ed2de55196 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegisteredEvent.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegisteredEvent.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegistrationException.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegistrationException.java
index 3331c71766..6f17550518 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegistrationException.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaRegistrationException.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 public class SchemaRegistrationException extends RuntimeException {
diff --git a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaType.java b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaType.java
index 31fb7bcee4..4f717105dd 100644
--- a/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaType.java
+++ b/persistence-commons/persistence-commons-api/src/main/java/org/kie/kogito/persistence/api/schema/SchemaType.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.api.schema;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-api/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-api/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/persistence-commons/persistence-commons-api/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-api/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/persistence-commons/persistence-commons-infinispan/pom.xml b/persistence-commons/persistence-commons-infinispan/pom.xml
index f3509f2225..63fb5c1f7c 100644
--- a/persistence-commons/persistence-commons-infinispan/pom.xml
+++ b/persistence-commons/persistence-commons-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/Constants.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/Constants.java
index 19a2b2bc42..14ec48ce46 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/Constants.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.infinispan;
 
 public class Constants {
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
index db44c00b62..4d4ea17f91 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
index 0dfdecaba8..cfee4ee89a 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.infinispan.cache;
 
 import java.util.Optional;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java
index 598223d1bc..29292da9aa 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.infinispan.cache;
 
 import java.util.HashMap;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
index dcefbb87a7..ed1101d20d 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.cache;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
index 363822f1f2..a18994b5c4 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.cache;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/KogitoCacheDefaultConfiguration.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/KogitoCacheDefaultConfiguration.java
index e7fcdc32d6..af9228d5a9 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/KogitoCacheDefaultConfiguration.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/KogitoCacheDefaultConfiguration.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.cache;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
index cb4722bcad..8e42cfda22 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.infinispan.cache;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/AbstractCacheObjectListener.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/AbstractCacheObjectListener.java
index db1a3d0dca..c94defd19e 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/AbstractCacheObjectListener.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/AbstractCacheObjectListener.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.listener;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectCreatedListener.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectCreatedListener.java
index bcfe324c8c..da9ffca6cc 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectCreatedListener.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectCreatedListener.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.listener;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectRemovedListener.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectRemovedListener.java
index 4986a96da7..e5a9734d1c 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectRemovedListener.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectRemovedListener.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.listener;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectUpdatedListener.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectUpdatedListener.java
index f0c2fdf6e7..c05823dacf 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectUpdatedListener.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/listener/CacheObjectUpdatedListener.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.listener;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/protostream/AbstractMarshaller.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/protostream/AbstractMarshaller.java
index 00ea7925e9..0b4b5fa343 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/protostream/AbstractMarshaller.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/protostream/AbstractMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.protostream;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/query/InfinispanQuery.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/query/InfinispanQuery.java
index 0d2c226612..319ac508dd 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/query/InfinispanQuery.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/query/InfinispanQuery.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.query;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-infinispan/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-infinispan/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserverTest.java b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserverTest.java
index f98ee486c7..8dbb0a224e 100644
--- a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserverTest.java
+++ b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserverTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.infinispan.cache;
 
 import java.util.Optional;
diff --git a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
index e3a7176272..4eee6b1fe6 100644
--- a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
+++ b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.infinispan.cache;
 
 import java.util.ArrayList;
diff --git a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/query/InfinispanQueryTest.java b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/query/InfinispanQueryTest.java
index 19047a8a06..d5aeb1b725 100644
--- a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/query/InfinispanQueryTest.java
+++ b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/query/InfinispanQueryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.infinispan.query;
 
diff --git a/persistence-commons/persistence-commons-infinispan/src/test/resources/application.properties b/persistence-commons/persistence-commons-infinispan/src/test/resources/application.properties
index f76aa48895..927b52afea 100644
--- a/persistence-commons/persistence-commons-infinispan/src/test/resources/application.properties
+++ b/persistence-commons/persistence-commons-infinispan/src/test/resources/application.properties
@@ -1,2 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Kogito
 kogito.apps.persistence.type=infinispan
\ No newline at end of file
diff --git a/persistence-commons/persistence-commons-mongodb/pom.xml b/persistence-commons/persistence-commons-mongodb/pom.xml
index 481ad01668..8cecd7af43 100644
--- a/persistence-commons/persistence-commons-mongodb/pom.xml
+++ b/persistence-commons/persistence-commons-mongodb/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/Constants.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/Constants.java
index 32a02e7535..b573bb034e 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/Constants.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb;
 
 public class Constants {
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
index 89ef57e98b..4a918da36e 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.client;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexCreateOrUpdateEvent.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexCreateOrUpdateEvent.java
index 9ee4cb4239..a452d87c47 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexCreateOrUpdateEvent.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexCreateOrUpdateEvent.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.index;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
index b0556974ce..eb379b3bd2 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.index;
 
 import java.util.Collection;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
index 03a92c6162..d68648d113 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.index;
 
 import java.util.Optional;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/ProcessIndexEvent.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/ProcessIndexEvent.java
index b3811f6b73..a367124dd1 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/ProcessIndexEvent.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/ProcessIndexEvent.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.index;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/ModelUtils.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/ModelUtils.java
index d739a96f66..084eff0bb5 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/ModelUtils.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/ModelUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.model;
 
 import java.time.Instant;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapper.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapper.java
index 860ea1bd43..32e354bafd 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapper.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.model;
 
 import java.util.regex.Pattern;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/MongoQuery.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/MongoQuery.java
index 13b8c5b22e..87a642e26c 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/MongoQuery.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/MongoQuery.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.query;
 
 import java.util.LinkedList;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/QueryUtils.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/QueryUtils.java
index ddc6bc13cf..f3424f7ae2 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/QueryUtils.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/query/QueryUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.query;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoModelService.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoModelService.java
index b4ade830a2..08cdbcafe8 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoModelService.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoModelService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import org.kie.kogito.persistence.mongodb.model.MongoEntityMapper;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoObjectListenerException.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoObjectListenerException.java
index 34f5a81f5f..253c0a25d8 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoObjectListenerException.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoObjectListenerException.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 public class MongoObjectListenerException extends RuntimeException {
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorage.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorage.java
index 4721faf7f3..8c6201b54b 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorage.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorage.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 import org.bson.Document;
@@ -27,7 +28,7 @@
 import org.kie.kogito.persistence.mongodb.query.MongoQuery;
 
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
 
 import io.smallrye.mutiny.Multi;
 
@@ -91,15 +92,11 @@ public V get(String o) {
 
     @Override
     public V put(String s, V v) {
-        V oldValue = this.get(s);
-        Optional.ofNullable(oldValue).ifPresentOrElse(
-                o -> Optional.ofNullable(v).map(n -> mapper.mapToEntity(s, n)).ifPresent(
-                        e -> this.mongoCollection.replaceOne(
-                                new Document(MONGO_ID, s),
-                                e, new ReplaceOptions().upsert(true))),
-                () -> Optional.ofNullable(v).map(n -> mapper.mapToEntity(s, n)).ifPresent(
-                        e -> this.mongoCollection.insertOne(e)));
-        return Objects.nonNull(v) ? oldValue : null;
+        this.mongoCollection.findOneAndReplace(
+                new Document(MONGO_ID, s),
+                mapper.mapToEntity(s, v),
+                new FindOneAndReplaceOptions().upsert(true));
+        return v;
     }
 
     @Override
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
index f25664dcd9..d51d0aba5e 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/StorageUtils.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/StorageUtils.java
index 78a8917ead..50ecce2f92 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/StorageUtils.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/StorageUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import java.util.function.Function;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-mongodb/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-mongodb/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/HealthCheckIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/HealthCheckIT.java
index cd6f4ac75e..8c8d818d54 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/HealthCheckIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/HealthCheckIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb;
 
 import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
index 24e0010b32..737e0e587e 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.client;
 
 import javax.inject.Inject;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
index 1c3f29ed45..4a6021ba5f 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.index;
 
 import java.util.HashMap;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptorTest.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptorTest.java
index 5dbb477809..d50a8fe9d3 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptorTest.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptorTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.index;
 
 import java.util.Optional;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoEntityMapper.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoEntityMapper.java
index 0ba41e9307..154781e073 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoEntityMapper.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoEntityMapper.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.mock;
 
 import org.bson.Document;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
index f9182c8655..98e9f29847 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.mock;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
index 1b75ed21ad..40a2dc61d8 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.mock;
 
 import java.util.Map;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/ModelUtilsTest.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/ModelUtilsTest.java
index c1209e3109..179248b9fb 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/ModelUtilsTest.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/ModelUtilsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.model;
 
 import java.time.ZonedDateTime;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapperTest.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapperTest.java
index d09f05a886..1ba0f16529 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapperTest.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/model/MongoEntityMapperTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.model;
 
 import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
index d0f7a66845..19289b04d0 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.query;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/QueryUtilsTest.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/QueryUtilsTest.java
index df6abe0eb4..af7c55becd 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/QueryUtilsTest.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/QueryUtilsTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.query;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
index 5de3275735..92a69676bb 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import javax.inject.Inject;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
index b3c8a6f5ce..e3bad6d697 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import javax.inject.Inject;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
index 8cbae2fe6e..58e39d4d9d 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import javax.inject.Inject;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
index bb5b74de68..36ffc73257 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.mongodb.storage;
 
 import java.util.Map;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/resources/application.properties b/persistence-commons/persistence-commons-mongodb/src/test/resources/application.properties
index 1ac6ecfb9f..ebc31394c1 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/resources/application.properties
+++ b/persistence-commons/persistence-commons-mongodb/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Quarkus
 quarkus.log.console.enable=true
 quarkus.log.console.level=INFO
diff --git a/persistence-commons/persistence-commons-oracle/pom.xml b/persistence-commons/persistence-commons-oracle/pom.xml
index c4ac717bb9..ab6db2dbd8 100644
--- a/persistence-commons/persistence-commons-oracle/pom.xml
+++ b/persistence-commons/persistence-commons-oracle/pom.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/Constants.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/Constants.java
index 68838b430b..7290d1682a 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/Constants.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle;
 
 public final class Constants {
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
index 5ab54e90ae..507ad8acd9 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.oracle;
 
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorage.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorage.java
index 37c655ad60..b544472c81 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorage.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle;
 
 import java.util.Map;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
index fbc8c99164..e577e7e400 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java
index 8b67f527fa..bee97ed843 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/hibernate/JsonBinaryType.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle.hibernate;
 
 import java.io.Serializable;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
index a1c98da330..2a215f6a1a 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle.model;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
index 488d2dad32..12eba177ce 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheId.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheId.java
index a4bf349cc4..124b8ccfa7 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheId.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheId.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle.model;
 
 import java.io.Serializable;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-oracle/src/main/resources/META-INF/beans.xml
index 72a7a85a63..a0eb9fbf8c 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-oracle/src/main/resources/META-INF/beans.xml
@@ -1,16 +1,20 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/persistence-commons/persistence-commons-oracle/src/test/docker/docker-compose.yml b/persistence-commons/persistence-commons-oracle/src/test/docker/docker-compose.yml
index 0940aa1f8f..8d6bcb1d46 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/docker/docker-compose.yml
+++ b/persistence-commons/persistence-commons-oracle/src/test/docker/docker-compose.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: "3"
 
 services:
diff --git a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
index 55b6b539e8..41134f0ffb 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
+++ b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/ProcessInstanceModel.java b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/ProcessInstanceModel.java
index e7de7d8a1c..d67998a908 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/ProcessInstanceModel.java
+++ b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/ProcessInstanceModel.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.oracle;
 
 import java.time.ZonedDateTime;
diff --git a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
index 4c3faf1d09..ca2b0d05ec 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
+++ b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.schema;
 
 import java.util.EnumSet;
@@ -28,6 +30,7 @@
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
 import org.kie.kogito.persistence.oracle.model.CacheEntity;
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoOracleSqlContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -35,7 +38,7 @@ public class DDLSchemaExporter {
 
     public static void main(String[] args) {
         try (KogitoOracleSqlContainer oracle = new KogitoOracleSqlContainer()) {
-            oracle.waitingFor(Wait.forListeningPort());
+            oracle.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
             oracle.start();
             Map<String, String> settings = new HashMap<>();
             settings.put(Environment.URL, oracle.getJdbcUrl());
diff --git a/persistence-commons/persistence-commons-oracle/src/test/resources/application.properties b/persistence-commons/persistence-commons-oracle/src/test/resources/application.properties
index 7ba39c0e9e..2c5562db02 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/resources/application.properties
+++ b/persistence-commons/persistence-commons-oracle/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.apps.persistence.type=oracle
 # configure your datasource
 quarkus.datasource.db-kind=oracle
diff --git a/persistence-commons/persistence-commons-postgresql/pom.xml b/persistence-commons/persistence-commons-postgresql/pom.xml
index 3715d7ab9a..4a5ecaa1ff 100644
--- a/persistence-commons/persistence-commons-postgresql/pom.xml
+++ b/persistence-commons/persistence-commons-postgresql/pom.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/Constants.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/Constants.java
index c35cca6660..9a99db970c 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/Constants.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql;
 
 public final class Constants {
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
index b17b3b19be..61605f3367 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql;
 
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorage.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorage.java
index 94abb62cd4..fbe7964024 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorage.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql;
 
 import java.util.Map;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
index 066a04b31b..4d5e60407d 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java
index 83622105ba..3f360bba2b 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/hibernate/JsonBinaryType.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql.hibernate;
 
 import java.io.Serializable;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
index 7e124c8399..1887cfc0ff 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql.model;
 
 import java.util.Objects;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
index fea2b8f8f3..41eb084f81 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql.model;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheId.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheId.java
index 0a8682d145..72b7b1e68e 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheId.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheId.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql.model;
 
 import java.io.Serializable;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-postgresql/src/main/resources/META-INF/beans.xml
index 72a7a85a63..a0eb9fbf8c 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-postgresql/src/main/resources/META-INF/beans.xml
@@ -1,16 +1,20 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/docker/docker-compose.yml b/persistence-commons/persistence-commons-postgresql/src/test/docker/docker-compose.yml
index 9adbc3840a..06a44f4beb 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/docker/docker-compose.yml
+++ b/persistence-commons/persistence-commons-postgresql/src/test/docker/docker-compose.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: "3"
 
 services:
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
index cb8f73be08..eb1c1cb7ef 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
+++ b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/ProcessInstanceModel.java b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/ProcessInstanceModel.java
index fb78eaf0ea..8fac9bd024 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/ProcessInstanceModel.java
+++ b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/ProcessInstanceModel.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.postgresql;
 
 import java.time.ZonedDateTime;
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
index 98a54340f2..17e883c8ab 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
+++ b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/schema/DDLSchemaExporter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.schema;
 
 import java.util.EnumSet;
@@ -28,6 +30,7 @@
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
 import org.kie.kogito.persistence.postgresql.model.CacheEntity;
+import org.kie.kogito.testcontainers.Constants;
 import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -35,7 +38,7 @@ public class DDLSchemaExporter {
 
     public static void main(String[] args) {
         try (KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer()) {
-            postgresql.waitingFor(Wait.forListeningPort());
+            postgresql.waitingFor(Wait.forListeningPort()).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
             postgresql.start();
             Map<String, String> settings = new HashMap<>();
             settings.put(Environment.URL, postgresql.getJdbcUrl());
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/resources/application.properties b/persistence-commons/persistence-commons-postgresql/src/test/resources/application.properties
index bf111d7e4e..ad5a7009ab 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/resources/application.properties
+++ b/persistence-commons/persistence-commons-postgresql/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.apps.persistence.type=postgresql
 # configure your datasource
 quarkus.datasource.db-kind=postgresql
diff --git a/persistence-commons/persistence-commons-protobuf/pom.xml b/persistence-commons/persistence-commons-protobuf/pom.xml
index 213109e4b2..88d60a5cfc 100644
--- a/persistence-commons/persistence-commons-protobuf/pom.xml
+++ b/persistence-commons/persistence-commons-protobuf/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/Constants.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/Constants.java
index 761474adb2..2899cc9df3 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/Constants.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 public class Constants {
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/FileDescriptorRegisteredEvent.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/FileDescriptorRegisteredEvent.java
index d00f0e29a7..9cfc4fcb5b 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/FileDescriptorRegisteredEvent.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/FileDescriptorRegisteredEvent.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.protobuf;
 
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtoIndexParser.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtoIndexParser.java
index b96becdbb2..c0ddca8be2 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtoIndexParser.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtoIndexParser.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 import java.util.ArrayList;
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileMonitorException.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileMonitorException.java
index fb450ce39f..8146e06bb5 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileMonitorException.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileMonitorException.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 class ProtobufFileMonitorException extends RuntimeException {
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileRegistrationException.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileRegistrationException.java
index 91b057540f..3787a8e8b1 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileRegistrationException.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufFileRegistrationException.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 public class ProtobufFileRegistrationException extends RuntimeException {
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
index 340e7bbfe7..12ba72ae3a 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
@@ -1,27 +1,30 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.protobuf;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileSystems;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
+import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
@@ -74,16 +77,22 @@ public class ProtobufMonitorService {
     public void startMonitoring() {
         if (protoFiles.isPresent()) {
             String folderPath = protoFiles.get();
-            File protoFolder = new File(folderPath);
-            if (!protoFolder.exists()) {
-                throw new ProtobufFileMonitorException(format("Could not find proto files folder at: %s", folderPath));
+            Path protoFolder = Paths.get(folderPath);
+            if (!Files.exists(protoFolder)) {
+                LOGGER.warn("Could not find proto files folder at: {}. Disabling ProtobufMonitorService", folderPath);
+                return;
             }
 
-            registerFilesFromFolder(protoFolder.toPath());
+            if (!Files.isReadable(protoFolder)) {
+                LOGGER.warn("The folder {} does not have read access. Cannot register protofiles from that folder", folderPath);
+                return;
+            }
 
+            LOGGER.info("The folder {} is being used to registering files", folderPath);
+            registerFilesFromFolder(protoFolder);
             if (Boolean.TRUE.equals(monitor)) {
                 executorService = Executors.newSingleThreadExecutor();
-                executorService.submit(new FolderWatcher(registerProtoFile(), protoFolder.toPath()));
+                executorService.submit(new FolderWatcher(registerProtoFile(), protoFolder));
             }
         }
     }
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
index bba5d16e8a..723bc2f8d1 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.protobuf;
 
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufValidationException.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufValidationException.java
index fe95f6c638..e1a937fd07 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufValidationException.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufValidationException.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.protobuf;
 
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
index a7a89e9aae..3cec63c8ee 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.protobuf.domain;
 
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-protobuf/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-protobuf/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
index 6688804119..85177fe2ef 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 import javax.enterprise.event.Event;
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoIndexParserTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoIndexParserTest.java
index f692c1c095..98ad22d5fa 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoIndexParserTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoIndexParserTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 import java.util.Map;
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorServiceTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorServiceTest.java
index fd88807442..ef41e3b697 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorServiceTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorServiceTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.protobuf;
 
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
index 19d5419985..7d2ece4322 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 import javax.enterprise.event.Event;
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/TestUtils.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/TestUtils.java
index 550e7e05dc..f80c3c6d43 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/TestUtils.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/TestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.protobuf;
 
 import java.io.IOException;
diff --git a/persistence-commons/persistence-commons-redis/pom.xml b/persistence-commons/persistence-commons-redis/pom.xml
index 0cd9ea7373..6aee5bc555 100644
--- a/persistence-commons/persistence-commons-redis/pom.xml
+++ b/persistence-commons/persistence-commons-redis/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Constants.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Constants.java
index 5f533a99ac..0fc6cc1b7e 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Constants.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Constants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 public class Constants {
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/JsonUtils.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/JsonUtils.java
index e39aa82c18..c60e4e0ecc 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/JsonUtils.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/JsonUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
index 823cb487c6..7ff1c43b96 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
index e16434998f..b66a40e2a4 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.net.URL;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQuery.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQuery.java
index 8cbde66dea..c75e9d1a6f 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQuery.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQuery.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.io.IOException;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQueryFactory.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQueryFactory.java
index df94c7b302..2bfab63b0b 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQueryFactory.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisQueryFactory.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.util.ArrayList;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisStorage.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisStorage.java
index 0bcb18e7a4..4309ac1999 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisStorage.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.util.HashMap;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Sanitizer.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Sanitizer.java
index 79d220c599..e8bdd71967 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Sanitizer.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/Sanitizer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 public class Sanitizer {
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisCreateIndexEvent.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisCreateIndexEvent.java
index eb3b01e971..2ecb3f63c3 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisCreateIndexEvent.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisCreateIndexEvent.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis.index;
 
 import java.util.ArrayList;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
index 855af8be99..a56f6f5a69 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis.index;
 
 import java.util.HashMap;
diff --git a/persistence-commons/persistence-commons-redis/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-redis/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/persistence-commons/persistence-commons-redis/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-redis/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/Person.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/Person.java
index 39eeb99a18..343da0d7a2 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/Person.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/Person.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisClientMock.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisClientMock.java
index 8ed88ad370..539f797dcd 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisClientMock.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisClientMock.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.io.IOException;
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryFactoryTest.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryFactoryTest.java
index bc44f442e4..9245bcf1b9 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryFactoryTest.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryFactoryTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.util.ArrayList;
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryTest.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryTest.java
index ce78ab4c8e..fa6a69f874 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryTest.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisQueryTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.util.ArrayList;
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisStorageTest.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisStorageTest.java
index 8c2b6f613d..8c9097cefd 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisStorageTest.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/RedisStorageTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.util.Map;
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/SanitizerTest.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/SanitizerTest.java
index bbcca8c863..89e83e8d6c 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/SanitizerTest.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/SanitizerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 import java.util.stream.Stream;
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/TestContants.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/TestContants.java
index 5fe702c032..b442cf5062 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/TestContants.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/TestContants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis;
 
 public class TestContants {
diff --git a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/index/RedisIndexManagerTest.java b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/index/RedisIndexManagerTest.java
index 2615bf740d..46252b4b1a 100644
--- a/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/index/RedisIndexManagerTest.java
+++ b/persistence-commons/persistence-commons-redis/src/test/java/org/kie/kogito/persistence/redis/index/RedisIndexManagerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.persistence.redis.index;
 
 import java.util.List;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml
index 9b64126246..25119fd69e 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
index f7d2e01468..4fb44daba2 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.api;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseBootstrapLoaderImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseBootstrapLoaderImpl.java
index 61fcac10de..90507d123e 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseBootstrapLoaderImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseBootstrapLoaderImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandler.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandler.java
index 2cb3e46da0..61c7e361d0 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandler.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BootstrapLoader.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BootstrapLoader.java
index 5b16f795df..7d11f134c2 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BootstrapLoader.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/bootstrap/BootstrapLoader.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
index 26e4c32065..26aaf9a90b 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/DatabaseManager.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/DatabaseManager.java
index 8e0b6238c7..d709bfa541 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/DatabaseManager.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/DatabaseManager.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationAction.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationAction.java
index 754a2a5179..bed30eab84 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationAction.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationAction.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/Validations.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/Validations.java
index 8bf4ccdd26..4a11b157ed 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/Validations.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/Validations.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/ApplyMappingSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/ApplyMappingSqlBuilder.java
index 145bb3f4c8..56f0601de1 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/ApplyMappingSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/ApplyMappingSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/BaseContext.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/BaseContext.java
index 40f597a390..3d22b2b366 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/BaseContext.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/BaseContext.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/Context.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/Context.java
index 3a81fc8e58..23dee18c2f 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/Context.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/Context.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/IndexesSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/IndexesSqlBuilder.java
index ad7672d948..fc91218ef0 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/IndexesSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/IndexesSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TableSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TableSqlBuilder.java
index 78822b8135..40cc3a68f6 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TableSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TableSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerDeleteSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerDeleteSqlBuilder.java
index 9f3eb74ebb..1f6d39f851 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerDeleteSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerDeleteSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerInsertSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerInsertSqlBuilder.java
index 5cd21deb12..8a47a97378 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerInsertSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/sqlbuilders/TriggerInsertSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseField.java
index a3bedf8ea1..0c3a428625 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseJsonField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseJsonField.java
index ff5bfb791a..0e8f4a9229 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseJsonField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseJsonField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMapping.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMapping.java
index e0e740766a..881bfbb482 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMapping.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMapping.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinition.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinition.java
index 59b8ed8099..47ab102ec5 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinition.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinition.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinitions.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinitions.java
index 4cfea5f03e..4149a99e0d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinitions.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BaseMappingDefinitions.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BasePartitionField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BasePartitionField.java
index 7a8ad6c893..83211a71a3 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BasePartitionField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/BasePartitionField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Field.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Field.java
index 4642aea7c1..1a5dedbb8c 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Field.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Field.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/JsonField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/JsonField.java
index 61f3038b9f..0872ce2a0c 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/JsonField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/JsonField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Mapping.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Mapping.java
index f44f1a4210..bf924ba9ee 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Mapping.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/Mapping.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinition.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinition.java
index a26bb120e9..4231a62faa 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinition.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinition.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinitions.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinitions.java
index 4ca34d0e99..e2aa5079ff 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinitions.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/MappingDefinitions.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/PartitionField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/PartitionField.java
index 3f3f02a6c7..ebdd442560 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/PartitionField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/PartitionField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/JoinPathSegment.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/JoinPathSegment.java
index eafd7190eb..b536b9600b 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/JoinPathSegment.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/JoinPathSegment.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model.paths;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/PathSegment.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/PathSegment.java
index 8946ea6c21..49d2bfcfea 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/PathSegment.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/PathSegment.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model.paths;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/TerminalPathSegment.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/TerminalPathSegment.java
index 30985e4165..bc44dbd46d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/TerminalPathSegment.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/model/paths/TerminalPathSegment.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.model.paths;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/service/MappingService.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/service/MappingService.java
index 1b0bf473ee..19727f38c5 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/service/MappingService.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/service/MappingService.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.service;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/resources/META-INF/beans.xml
index e99111e29b..ed166fabc6 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/resources/META-INF/beans.xml
@@ -1,15 +1,21 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   -->
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandlerTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandlerTest.java
index 4689f01b95..8afd570e6d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandlerTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/bootstrap/BaseStartupHandlerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
index 6449043e5b..87fe343779 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationActionTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationActionTest.java
index b14ca56d98..6221577481 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationActionTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/SchemaGenerationActionTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/ValidationsTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/ValidationsTest.java
index e220e9a6c9..ed31ae65f7 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/ValidationsTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/ValidationsTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypes.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypes.java
index 44b44acb56..06cbe53951 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypes.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypes.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.test;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypesImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypesImpl.java
index 231b36396c..4f26b34086 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypesImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/test/TestTypesImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.reporting.test;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/pom.xml b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/pom.xml
index 251e64ce92..ab95f05e26 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/pom.xml
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/pom.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/BasePostgresMappingsApiV1.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/BasePostgresMappingsApiV1.java
index e4dcd8d790..23bd5035d3 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/BasePostgresMappingsApiV1.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/BasePostgresMappingsApiV1.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.api;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
index 9cf889b925..ac33ad1483 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
index bad13f86fe..5a11b721ed 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
index ea180a3b51..2a5a0f2d2f 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
index da36c8e646..3771d5f51a 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContext.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContext.java
index e51de8c542..20df7bb039 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContext.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContext.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
index e3b68c3e0f..6bd72bfa45 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
index 293d3c20ca..3a694a96eb 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
index cdd49bad69..20066cde19 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
index dd3083db79..11abb8df01 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/JsonType.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/JsonType.java
index f9285cb533..46b47dbab0 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/JsonType.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/JsonType.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresField.java
index a7ad49e4b8..5bd14d52a8 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonField.java
index 8769c99c9e..7f40101be8 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMapping.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMapping.java
index 76d26b6e45..d0e1c11977 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMapping.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMapping.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinition.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinition.java
index eeec559100..11c1cd214b 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinition.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinition.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitions.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitions.java
index aa67b23a9a..421ad5a07e 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitions.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitions.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionField.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionField.java
index e9aba0ba46..79f23dd121 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionField.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/paths/PostgresTerminalPathSegment.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/paths/PostgresTerminalPathSegment.java
index 15e4b08d21..1d2a304e3a 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/paths/PostgresTerminalPathSegment.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/model/paths/PostgresTerminalPathSegment.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model.paths;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
index 0e6b36ac99..55e83a500d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.service;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/resources/META-INF/beans.xml
index e99111e29b..ed166fabc6 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/resources/META-INF/beans.xml
@@ -1,15 +1,21 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   -->
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImplTest.java
index e259a8d795..35c5ec58f8 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImplTest.java
index b68f8d1069..0389eeae78 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/PostgresValidationsTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/PostgresValidationsTest.java
index 97359b2292..aa3303cee1 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/PostgresValidationsTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/PostgresValidationsTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
index c68d7ea06b..6d91ed3838 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderTest.java
index d08fe01dad..197946b799 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContextTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContextTest.java
index c6f418f9eb..5f485aa3e1 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContextTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresContextTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilderTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilderTest.java
index f9155551c0..4e7348b216 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilderTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilderTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilderTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilderTest.java
index d7f6408790..bc73569986 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilderTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilderTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilderTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilderTest.java
index c81db5ef0e..1a25bc93ff 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilderTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilderTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilderTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilderTest.java
index 4f19e0df12..f06c36b3f8 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilderTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilderTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresFieldTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresFieldTest.java
index 39b0cd2a46..0cae1befa2 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresFieldTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresFieldTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonFieldTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonFieldTest.java
index bdcc02fc85..94dc620afc 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonFieldTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresJsonFieldTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionTest.java
index e1ac331f60..f88de0e29f 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionsTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionsTest.java
index 064b381e2b..f0bd72cf28 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionsTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingDefinitionsTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingTest.java
index 7b0b2595b3..da558af0e8 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresMappingTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionFieldTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionFieldTest.java
index 69bc55ccb4..0d2c1a9a9f 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionFieldTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/model/PostgresPartitionFieldTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.model;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImplTest.java
index 31e7dd46ec..2999f3cbd1 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.service;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/application.properties b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/application.properties
index 1e30fee458..d8147b53e0 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/application.properties
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 #Postgresql storage...
 kogito.apps.persistence.type=postgresql
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml
index 3e68a4ff00..f3e6a6ad46 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
index be8c522c8a..842750fea2 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.api;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
index 7fb123fd63..04b7b3e63d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/resources/META-INF/beans.xml b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/resources/META-INF/beans.xml
index e99111e29b..ed166fabc6 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/resources/META-INF/beans.xml
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/resources/META-INF/beans.xml
@@ -1,15 +1,21 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   -->
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicType.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicType.java
index d2e67adaf7..8fc2d8d8cc 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicType.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicType.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
index 506f0a72e0..275847a5bf 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalType.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalType.java
index 8df07fe5de..34f447e17d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalType.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalType.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
index c3b154c940..68f8b41fb7 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalType.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalType.java
index c0caa10056..1ccb5bff72 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalType.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalType.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
index 90c0ce6d47..75143892ee 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java
index 4e9cef3bb8..124380608b 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1IT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.api;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
index c78ff8beb4..c418160901 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.api;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
index be8c173540..c6ed8a0fa2 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/DynamicType.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/DynamicType.java
index 0fc7dad422..3dfced6dc4 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/DynamicType.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/DynamicType.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
index bef6116207..d685ff1bf8 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/application.properties b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/application.properties
index ff14f9446c..7109a706bc 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/application.properties
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Postgresql storage
 kogito.apps.persistence.type=postgresql
 
diff --git a/persistence-commons/persistence-commons-reporting-parent/pom.xml b/persistence-commons/persistence-commons-reporting-parent/pom.xml
index 81f531a30f..f20e420948 100644
--- a/persistence-commons/persistence-commons-reporting-parent/pom.xml
+++ b/persistence-commons/persistence-commons-reporting-parent/pom.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/persistence-commons/pom.xml b/persistence-commons/pom.xml
index ccf7b4e356..268584b3fc 100644
--- a/persistence-commons/pom.xml
+++ b/persistence-commons/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/pom.xml b/pom.xml
index fde41c843e..ee6acce6b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
@@ -19,9 +39,9 @@
   <repositories>
     <!-- Bootstrap repository to locate the parent pom when the parent pom has not been build locally. -->
     <repository>
-        <id>jboss-public-repository-group</id>
-        <name>JBoss Public Repository Group</name>
-        <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+        <id>apache-public-repository-group</id>
+        <name>Apache Public Repository Group</name>
+        <url>https://repository.apache.org/content/groups/public/</url>
         <layout>default</layout>
         <releases>
             <enabled>true</enabled>
diff --git a/runtime-tools-quarkus-extension-parent/pom.xml b/runtime-tools-quarkus-extension-parent/pom.xml
index 0516063d91..4fb4ce74eb 100644
--- a/runtime-tools-quarkus-extension-parent/pom.xml
+++ b/runtime-tools-quarkus-extension-parent/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <parent>
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml
index 3243a93dd4..2c402db635 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
@@ -113,7 +133,11 @@
               <outputDirectory>${basedir}/target/classes/dev-static/webapp</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${path.to.webapp.app}/dist</directory>
+                  <directory>${path.to.webapp.app}/dist/resources/webapp</directory>
+                  <filtering>false</filtering>
+                </resource>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/webapp</directory>
                   <filtering>false</filtering>
                 </resource>
               </resources>
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
index e530e65254..f2b39a6f5d 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.runtime.tools.quarkus.extension.deployment;
 
@@ -43,6 +46,7 @@
 public class DevConsoleProcessor {
 
     private static final String STATIC_RESOURCES_PATH = "dev-static/";
+    private static final String BASE_RELATIVE_URL = "/q/dev/org.kie.kogito.runtime-tools-quarkus-extension";
     private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index";
 
     @SuppressWarnings("unused")
@@ -74,7 +78,13 @@ public void deployStaticResources(final DevConsoleRecorder recorder,
                 true);
 
         routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
-                .route("/q/dev/org.kie.kogito.runtime-tools-quarkus-extension/resources/*")
+                .route(BASE_RELATIVE_URL + "/resources/*")
+                .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
+                        shutdownContext))
+                .build());
+
+        routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
+                .route(BASE_RELATIVE_URL + "/*")
                 .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
                         shutdownContext))
                 .build());
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/RuntimeToolsQuarkusExtensionProcessor.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/RuntimeToolsQuarkusExtensionProcessor.java
index 773ec76236..8b80a76d05 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/RuntimeToolsQuarkusExtensionProcessor.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/RuntimeToolsQuarkusExtensionProcessor.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/audit.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/audit.html
index bf4730c3b9..138e54cf1a 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/audit.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/audit.html
@@ -1,48 +1,41 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-#envelope-app {
-    width: 100vw;
-    height: calc(100vh - 98px);
-}
-{/style}
-{#title}Runtime UI{/title}
-{#body}
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+#envelope-app { width: 100vw; height: calc(100vh - 98px); } {/style}
+{#title}Runtime UI{/title} {#body}
 <div id="envelope-app"></div>
 
 <script src="resources/webapp/standalone.js"></script>
 <script>
-    const devUI = RuntimeToolsDevUI.open({
-        container: document.getElementById("envelope-app"),
-        isDataIndexAvailable: {info:isProcessEnabled},
-        isTracingEnabled: {info:isTracingEnabled},
-        users: {info:userInfo.arrayRepresentation.raw},
-        dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
-        trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
-        page: "Audit",
-        devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
-        openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
-        availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
-    })
+  const devUI = RuntimeToolsDevUI.open({
+      container: document.getElementById("envelope-app"),
+      isDataIndexAvailable: {info:isProcessEnabled},
+      isTracingEnabled: {info:isTracingEnabled},
+      users: {info:userInfo.arrayRepresentation.raw},
+      dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
+      trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
+      page: "Audit",
+      devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
+      openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
+      availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
+  })
 </script>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/embedded.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/embedded.html
index 95a698ac26..4f61d2f9b2 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/embedded.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/embedded.html
@@ -1,94 +1,96 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 {#if info:isProcessEnabled}
 <a href="{urlbase}/processInstances" class="badge badge-light">
-    <i class="fa fa-project-diagram fa-fw"></i>
-    Process Instances <span id="processInstancesCount" class="badge badge-light"/>
+  <i class="fa fa-project-diagram fa-fw"></i>
+  Process Instances
+  <span id="processInstancesCount" class="badge badge-light" />
 </a>
-<br/>
+<br />
 <a href="{urlbase}/tasks" class="badge badge-light">
-    <i class="fa fa-tasks fa-fw"></i>
-    Tasks <span id="tasksCount" class="badge badge-light"/>
+  <i class="fa fa-tasks fa-fw"></i>
+  Tasks <span id="tasksCount" class="badge badge-light" />
 </a>
-<br/>
+<br />
 <a href="{urlbase}/jobs" class="badge badge-light">
-    <i class="fa fa-clock fa-fw"></i>
-    Jobs <span id="jobsCount" class="badge badge-light"/>
+  <i class="fa fa-clock fa-fw"></i>
+  Jobs <span id="jobsCount" class="badge badge-light" />
 </a>
-<br/>
+<br />
 <a href="{urlbase}/forms" class="badge badge-light">
-    <i class="fab fa-wpforms fa-fw"></i>
-    Forms <span id="formsCount" class="badge badge-light"/>
+  <i class="fab fa-wpforms fa-fw"></i>
+  Forms <span id="formsCount" class="badge badge-light" />
 </a>
-{/if}
-{#if info:isTracingEnabled}
+{/if} {#if info:isTracingEnabled}
 <a href="{urlbase}/audit" class="badge badge-light">
-    <i class="fab fa-wpforms fa-fw"></i>
-    Audit investigation <span id="auditCount" class="badge badge-light"/>
+  <i class="fab fa-wpforms fa-fw"></i>
+  Audit investigation <span id="auditCount" class="badge badge-light" />
 </a>
-{/if}
-{#if info:isProcessEnabled == false && info:isTracingEnabled == false}
+{/if} {#if info:isProcessEnabled == false && info:isTracingEnabled == false}
 <p>No Kogito addons detected.</p>
-{/if}
-{#if info:isProcessEnabled}
+{/if} {#if info:isProcessEnabled}
 <script>
-    const graphqlUrl = "{config:property('kogito.data-index.url') ?: ''}/graphql";
+  const graphqlUrl = "{config:property('kogito.data-index.url') ?: ''}/graphql";
 
-    {|
-        const fillFormsCount = () => {
-            fetch("/forms/count")
-                .then(response => response.text())
-                .then(count => $("#formsCount").text(count))
-                .catch(error => {
-                    console.log("Error while trying to fetch forms count.");
-                    console.error(error);
-                });
-        };
+  {|
+      const fillFormsCount = () => {
+          fetch("/forms/count")
+              .then(response => response.text())
+              .then(count => $("#formsCount").text(count))
+              .catch(error => {
+                  console.log("Error while trying to fetch forms count.");
+                  console.error(error);
+              });
+      };
 
-        const fillGraphqlCount = (callback, graphql) => {
-            fetch(graphqlUrl, {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                    Accept: "application/json",
-                },
-                body: JSON.stringify({ query: graphql }),
-            })
-                .then(r => r.json())
-                .then(callback)
-                .catch(error => {
-                    console.log("Error while trying to fetch workflow instances count.");
-                    console.error(error);
-                });
-        };
+      const fillGraphqlCount = (callback, graphql) => {
+          fetch(graphqlUrl, {
+              method: "POST",
+              headers: {
+                  "Content-Type": "application/json",
+                  Accept: "application/json",
+              },
+              body: JSON.stringify({ query: graphql }),
+          })
+              .then(r => r.json())
+              .then(callback)
+              .catch(error => {
+                  console.log("Error while trying to fetch workflow instances count.");
+                  console.error(error);
+              });
+      };
 
-        fillGraphqlCount(function (json) {
-            $("#processInstancesCount").text(json.data.ProcessInstances.length)
-        }, "query getAllProcessesIds{  ProcessInstances{ id } }");
+      fillGraphqlCount(function (json) {
+          $("#processInstancesCount").text(json.data.ProcessInstances.length)
+      }, "query getAllProcessesIds{  ProcessInstances{ id } }");
 
-        fillGraphqlCount(function (json) {
-            $("#tasksCount").text(json.data.UserTaskInstances.length)
-        }, "query getAllTasksIds{  UserTaskInstances{ id } }");
+      fillGraphqlCount(function (json) {
+          $("#tasksCount").text(json.data.UserTaskInstances.length)
+      }, "query getAllTasksIds{  UserTaskInstances{ id } }");
 
-        fillGraphqlCount(function (json) {
-            $("#jobsCount").text(json.data.Jobs.length)
-        }, "query getAllJobsIds{  Jobs{ id } }");
+      fillGraphqlCount(function (json) {
+          $("#jobsCount").text(json.data.Jobs.length)
+      }, "query getAllJobsIds{  Jobs{ id } }");
 
-        fillFormsCount("forms");
-    |}
+      fillFormsCount("forms");
+  |}
 </script>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/forms.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/forms.html
index db8237f80f..39297c4322 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/forms.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/forms.html
@@ -1,48 +1,41 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-#envelope-app {
-    width: 100vw;
-    height: calc(100vh - 98px);
-}
-{/style}
-{#title}Runtime UI{/title}
-{#body}
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+#envelope-app { width: 100vw; height: calc(100vh - 98px); } {/style}
+{#title}Runtime UI{/title} {#body}
 <div id="envelope-app"></div>
 
 <script src="resources/webapp/standalone.js"></script>
 <script>
-    const devUI = RuntimeToolsDevUI.open({
-        container: document.getElementById("envelope-app"),
-        isDataIndexAvailable: {info:isProcessEnabled},
-        isTracingEnabled: {info:isTracingEnabled},
-        users: {info:userInfo.arrayRepresentation.raw},
-        dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
-        trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
-        page: "Forms",
-        devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
-        openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
-        availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
-    })
+  const devUI = RuntimeToolsDevUI.open({
+      container: document.getElementById("envelope-app"),
+      isDataIndexAvailable: {info:isProcessEnabled},
+      isTracingEnabled: {info:isTracingEnabled},
+      users: {info:userInfo.arrayRepresentation.raw},
+      dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
+      trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
+      page: "Forms",
+      devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
+      openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
+      availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
+  })
 </script>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/jobs.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/jobs.html
index 5eb041e6ed..4984ada1fd 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/jobs.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/jobs.html
@@ -1,48 +1,41 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-#envelope-app {
-    width: 100vw;
-    height: calc(100vh - 98px);
-}
-{/style}
-{#title}Runtime UI{/title}
-{#body}
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+#envelope-app { width: 100vw; height: calc(100vh - 98px); } {/style}
+{#title}Runtime UI{/title} {#body}
 <div id="envelope-app"></div>
 
 <script src="resources/webapp/standalone.js"></script>
 <script>
-    const devUI = RuntimeToolsDevUI.open({
-        container: document.getElementById("envelope-app"),
-        isDataIndexAvailable: {info:isProcessEnabled},
-        isTracingEnabled: {info:isTracingEnabled},
-        users: {info:userInfo.arrayRepresentation.raw},
-        dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
-        trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
-        page: "JobsManagement",
-        devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
-        openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
-        availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
-    })
+  const devUI = RuntimeToolsDevUI.open({
+      container: document.getElementById("envelope-app"),
+      isDataIndexAvailable: {info:isProcessEnabled},
+      isTracingEnabled: {info:isTracingEnabled},
+      users: {info:userInfo.arrayRepresentation.raw},
+      dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
+      trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
+      page: "JobsManagement",
+      devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
+      openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
+      availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
+  })
 </script>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/processInstances.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/processInstances.html
index 1faf228692..2a80ab0d62 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/processInstances.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/processInstances.html
@@ -1,48 +1,41 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-#envelope-app {
-    width: 100vw;
-    height: calc(100vh - 98px);
-}
-{/style}
-{#title}Runtime UI{/title}
-{#body}
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+#envelope-app { width: 100vw; height: calc(100vh - 98px); } {/style}
+{#title}Runtime UI{/title} {#body}
 <div id="envelope-app"></div>
 
 <script src="resources/webapp/standalone.js"></script>
 <script>
-    const devUI = RuntimeToolsDevUI.open({
-        container: document.getElementById("envelope-app"),
-        isDataIndexAvailable: {info:isProcessEnabled},
-        isTracingEnabled: {info:isTracingEnabled},
-        users: {info:userInfo.arrayRepresentation.raw},
-        dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
-        trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
-        page: "Processes",
-        devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
-        openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
-        availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
-    })
+  const devUI = RuntimeToolsDevUI.open({
+      container: document.getElementById("envelope-app"),
+      isDataIndexAvailable: {info:isProcessEnabled},
+      isTracingEnabled: {info:isTracingEnabled},
+      users: {info:userInfo.arrayRepresentation.raw},
+      dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
+      trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
+      page: "Processes",
+      devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
+      openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
+      availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
+  })
 </script>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/tasks.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/tasks.html
index 7e4ef54f6a..95937835f0 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/tasks.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/src/main/resources/dev-templates/tasks.html
@@ -1,48 +1,41 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-{#include main fluid=true}
-{#style}
-.main-container {
-    margin: 0;
-    padding: 0;
-}
-#envelope-app {
-    width: 100vw;
-    height: calc(100vh - 98px);
-}
-{/style}
-{#title}Runtime UI{/title}
-{#body}
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+{#include main fluid=true} {#style} .main-container { margin: 0; padding: 0; }
+#envelope-app { width: 100vw; height: calc(100vh - 98px); } {/style}
+{#title}Runtime UI{/title} {#body}
 <div id="envelope-app"></div>
 
 <script src="resources/webapp/standalone.js"></script>
 <script>
-    const devUI = RuntimeToolsDevUI.open({
-        container: document.getElementById("envelope-app"),
-        isDataIndexAvailable: {info:isProcessEnabled},
-        isTracingEnabled: {info:isTracingEnabled},
-        users: {info:userInfo.arrayRepresentation.raw},
-        dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
-        trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
-        page: "TaskInbox",
-        devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
-        openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
-        availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
-    })
+  const devUI = RuntimeToolsDevUI.open({
+      container: document.getElementById("envelope-app"),
+      isDataIndexAvailable: {info:isProcessEnabled},
+      isTracingEnabled: {info:isTracingEnabled},
+      users: {info:userInfo.arrayRepresentation.raw},
+      dataIndexUrl: "{config:property('kogito.data-index.url') ?: ''}/graphql",
+      trustyServiceUrl: "{config:property('kogito.trusty.http.url') ?: 'http://localhost:1336'}",
+      page: "TaskInbox",
+      devUIUrl: {#if config:property('kogito.dev-ui.url')}"{config:property('kogito.dev-ui.url')}"{#else}window.location.origin{/if},
+      openApiPath: "{config:property('quarkus.smallrye-openapi.path') or '/q/openapi.json'}",
+      availablePages: ["Processes", "Jobs", "Tasks", "Forms"]
+  })
 </script>
-{/body}
-{/include}
\ No newline at end of file
+{/body} {/include}
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
index bd503cd4b7..e5dcfc806a 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.java
index 48d146a6f6..2f821c5004 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.config;
 
 import java.util.Map;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.java
index 2220449cbe..30158794d2 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.config;
 
 import java.util.List;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
index 9d6b1f1b12..96a0cde271 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms;
 
 import java.io.FileNotFoundException;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsStorage.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsStorage.java
index dbe9ca2198..d0fe195db4 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsStorage.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsStorage.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms;
 
 import java.io.IOException;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
index c4ce69407f..6a37f90146 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.converter;
 
 import java.util.Collections;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
index 6b50c94383..9104f319b1 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.converter;
 
 import java.lang.annotation.Annotation;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
index 11812e67fc..5f1b2cf03e 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.impl;
 
 import java.io.File;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/Form.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/Form.java
index a1b27f9e8c..6b870d80ee 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/Form.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/Form.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model;
 
 public class Form {
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormConfiguration.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormConfiguration.java
index 893bfb8752..79b6ca2314 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormConfiguration.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormConfiguration.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model;
 
 public class FormConfiguration {
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormContent.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormContent.java
index f1781f110a..76598c2b4b 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormContent.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormContent.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model;
 
 public class FormContent {
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormFilter.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormFilter.java
index f7e79e07ea..d09eb1237b 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormFilter.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormFilter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model;
 
 import java.util.ArrayList;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormInfo.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormInfo.java
index c6ae9313ed..43e31a26df 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormInfo.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormInfo.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model;
 
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormResources.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormResources.java
index 2559dbc6d8..a819898d1f 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormResources.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/model/FormResources.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model;
 
 import java.util.LinkedHashMap;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/User.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/User.java
index 3baff19cd8..76d471ee0b 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/User.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/User.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.user;
 
 import java.util.List;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfo.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfo.java
index 70ff206aeb..ec42ad9e3f 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfo.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfo.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.user;
 
 import java.util.List;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplier.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplier.java
index b4b16d5a91..2e41d50191 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplier.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplier.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.user;
 
 import java.util.Collections;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/beans.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/beans.xml
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml
index a5b0fef71c..e7c3116378 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 name: Kogito Runtime Tools
 metadata:
   keywords:
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/application.properties b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/application.properties
index c8d161ac6f..44162f8bb8 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/application.properties
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/resources/application.properties
@@ -1 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 kogito.users.admin.groups=admin
\ No newline at end of file
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImplTest.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImplTest.java
index f5d6a1e178..d29daa53a5 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImplTest.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImplTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.impl;
 
 import java.io.File;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsTestProfile.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsTestProfile.java
index fbfa2fca44..164e561657 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsTestProfile.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsTestProfile.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.impl;
 
 import java.io.File;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplierTest.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplierTest.java
index 13b999334f..21249b3acb 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplierTest.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/user/UserInfoSupplierTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.runtime.tools.quarkus.extension.runtime.user;
 
 import java.util.*;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterview.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterview.html
index e9c52a3160..a663b92ede 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterview.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterview.html
@@ -1,31 +1,85 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <div>
   <fieldset disabled>
     <legend>Candidate</legend>
     <div>
       <div class="form-group">
         <label for="uniforms-0000-0002">Email</label>
-        <input type="text" id="uniforms-0000-0002" name="candidate.email" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0000-0002"
+          name="candidate.email"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0000-0003">Name</label>
-        <input type="text" id="uniforms-0000-0003" name="candidate.name" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0000-0003"
+          name="candidate.name"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0000-0005">Salary</label>
-        <input type="number" class="form-control" id="uniforms-0000-0005" name="candidate.salary" disabled step="1" value="" />
+        <input
+          type="number"
+          class="form-control"
+          id="uniforms-0000-0005"
+          name="candidate.salary"
+          disabled
+          step="1"
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0000-0006">Skills</label>
-        <input type="text" id="uniforms-0000-0006" name="candidate.skills" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0000-0006"
+          name="candidate.skills"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
     </div>
   </fieldset>
 
   <div class="form-check">
-    <input type="checkbox" id="uniforms-0000-0008" name="approve" class="form-check-input" />
+    <input
+      type="checkbox"
+      id="uniforms-0000-0008"
+      name="approve"
+      class="form-check-input"
+    />
     <label class="form-check-label" for="uniforms-0000-0008">Approve</label>
   </div>
 </div>
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterviewWithoutConfig.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterviewWithoutConfig.html
index e9c52a3160..a663b92ede 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterviewWithoutConfig.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_HRInterviewWithoutConfig.html
@@ -1,31 +1,85 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <div>
   <fieldset disabled>
     <legend>Candidate</legend>
     <div>
       <div class="form-group">
         <label for="uniforms-0000-0002">Email</label>
-        <input type="text" id="uniforms-0000-0002" name="candidate.email" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0000-0002"
+          name="candidate.email"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0000-0003">Name</label>
-        <input type="text" id="uniforms-0000-0003" name="candidate.name" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0000-0003"
+          name="candidate.name"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0000-0005">Salary</label>
-        <input type="number" class="form-control" id="uniforms-0000-0005" name="candidate.salary" disabled step="1" value="" />
+        <input
+          type="number"
+          class="form-control"
+          id="uniforms-0000-0005"
+          name="candidate.salary"
+          disabled
+          step="1"
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0000-0006">Skills</label>
-        <input type="text" id="uniforms-0000-0006" name="candidate.skills" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0000-0006"
+          name="candidate.skills"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
     </div>
   </fieldset>
 
   <div class="form-check">
-    <input type="checkbox" id="uniforms-0000-0008" name="approve" class="form-check-input" />
+    <input
+      type="checkbox"
+      id="uniforms-0000-0008"
+      name="approve"
+      class="form-check-input"
+    />
     <label class="form-check-label" for="uniforms-0000-0008">Approve</label>
   </div>
 </div>
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_ITInterview.html b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_ITInterview.html
index f4c5a14741..8a051de719 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_ITInterview.html
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/test/resources/forms/hiring_ITInterview.html
@@ -1,6 +1,31 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <div>
   <div class="form-check">
-    <input type="checkbox" id="uniforms-0001-0001" name="approve" class="form-check-input" />
+    <input
+      type="checkbox"
+      id="uniforms-0001-0001"
+      name="approve"
+      class="form-check-input"
+    />
     <label class="form-check-label" for="uniforms-0001-0001">Approve</label>
   </div>
 
@@ -9,22 +34,51 @@
     <div>
       <div class="form-group">
         <label for="uniforms-0001-0004">Email</label>
-        <input type="text" id="uniforms-0001-0004" name="candidate.email" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0001-0004"
+          name="candidate.email"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0001-0005">Name</label>
-        <input type="text" id="uniforms-0001-0005" name="candidate.name" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0001-0005"
+          name="candidate.name"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0001-0007">Salary</label>
-        <input type="number" class="form-control" id="uniforms-0001-0007" name="candidate.salary" disabled step="1" value="" />
+        <input
+          type="number"
+          class="form-control"
+          id="uniforms-0001-0007"
+          name="candidate.salary"
+          disabled
+          step="1"
+          value=""
+        />
       </div>
 
       <div class="form-group">
         <label for="uniforms-0001-0008">Skills</label>
-        <input type="text" id="uniforms-0001-0008" name="candidate.skills" class="form-control" disabled value="" />
+        <input
+          type="text"
+          id="uniforms-0001-0008"
+          name="candidate.skills"
+          class="form-control"
+          disabled
+          value=""
+        />
       </div>
     </div>
   </fieldset>
diff --git a/security-commons/pom.xml b/security-commons/pom.xml
index deea04848f..1e28ecb8a1 100644
--- a/security-commons/pom.xml
+++ b/security-commons/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/security-commons/src/main/java/org/kie/kogito/security/UserResource.java b/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
index e9cfce2af2..149df35470 100644
--- a/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
+++ b/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.security;
 
diff --git a/security-commons/src/main/resources/META-INF/beans.xml b/security-commons/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/security-commons/src/main/resources/META-INF/beans.xml
+++ b/security-commons/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java b/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java
index eb05c2a78c..a013593b8c 100644
--- a/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java
+++ b/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.security;
 
diff --git a/security-commons/src/test/java/org/kie/kogito/security/UserResourceTest.java b/security-commons/src/test/java/org/kie/kogito/security/UserResourceTest.java
index ab1a20e928..ee64e12aba 100644
--- a/security-commons/src/test/java/org/kie/kogito/security/UserResourceTest.java
+++ b/security-commons/src/test/java/org/kie/kogito/security/UserResourceTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.security;
 
diff --git a/security-commons/src/test/resources/application.properties b/security-commons/src/test/resources/application.properties
index 11b370cda5..dfe66a927c 100644
--- a/security-commons/src/test/resources/application.properties
+++ b/security-commons/src/test/resources/application.properties
@@ -1,21 +1,26 @@
 #
-# Copyright 2020 Red Hat, Inc. and/or its affiliates.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Keycloak oidc
 quarkus.oidc.enabled=true
 quarkus.oidc.tenant-enabled=true
 quarkus.oidc.client-id=kogito-app
-quarkus.oidc.credentials.secret=secret
\ No newline at end of file
+quarkus.oidc.credentials.secret=secret
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/task-console/pom.xml b/task-console/pom.xml
index 3ae5c7dc1e..0ac424bcc4 100644
--- a/task-console/pom.xml
+++ b/task-console/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java b/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
index 7c257523f5..a6540fbee1 100644
--- a/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
+++ b/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.task.console;
 
diff --git a/task-console/src/main/resources/application.properties b/task-console/src/main/resources/application.properties
index 9ee70c1148..f9f62e1406 100644
--- a/task-console/src/main/resources/application.properties
+++ b/task-console/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 kogito.dataindex.http.url=http://localhost:8180/graphql
 #keycloak client config
diff --git a/task-console/src/main/resources/templates/index.html b/task-console/src/main/resources/templates/index.html
index 559692987a..b439540967 100644
--- a/task-console/src/main/resources/templates/index.html
+++ b/task-console/src/main/resources/templates/index.html
@@ -1,19 +1,23 @@
 <!--
-  ~ Copyright 2020 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
   <head>
@@ -36,7 +40,7 @@
   </script>
   <body class="pf-m-redhat-font">
     <noscript>Enabling JavaScript is required to run this app.</noscript>
-    <div id="root" style="height: 100%;"></div>
+    <div id="root" style="height: 100%"></div>
     <script type="text/javascript" src="/app.bundle.js"></script>
   </body>
 </html>
diff --git a/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java b/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
index c31e40da8b..ea181adfac 100644
--- a/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
+++ b/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.task.console;
 
diff --git a/task-console/src/test/java/org/kie/kogito/task/console/StaticContentTest.java b/task-console/src/test/java/org/kie/kogito/task/console/StaticContentTest.java
index ba25ecb04c..f982a23c01 100644
--- a/task-console/src/test/java/org/kie/kogito/task/console/StaticContentTest.java
+++ b/task-console/src/test/java/org/kie/kogito/task/console/StaticContentTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.task.console;
 
diff --git a/task-console/src/test/java/org/kie/kogito/task/console/VertxRouterTest.java b/task-console/src/test/java/org/kie/kogito/task/console/VertxRouterTest.java
index f8903c86ed..27d8b90a60 100644
--- a/task-console/src/test/java/org/kie/kogito/task/console/VertxRouterTest.java
+++ b/task-console/src/test/java/org/kie/kogito/task/console/VertxRouterTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.task.console;
 
diff --git a/trusty-ui/pom.xml b/trusty-ui/pom.xml
index 3bf28bc770..aad83fb391 100644
--- a/trusty-ui/pom.xml
+++ b/trusty-ui/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java b/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
index 301bc2ed33..4f7cb7e072 100644
--- a/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
+++ b/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.ui;
 
diff --git a/trusty-ui/src/main/resources/application.properties b/trusty-ui/src/main/resources/application.properties
index 11f4611dae..a3a905c8c4 100644
--- a/trusty-ui/src/main/resources/application.properties
+++ b/trusty-ui/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 kogito.trusty.http.url=${KOGITO_TRUSTY_HTTP_URL:http://localhost:8180}
 
diff --git a/trusty-ui/src/main/resources/templates/index.html b/trusty-ui/src/main/resources/templates/index.html
index c92d117428..0bbfade4f4 100644
--- a/trusty-ui/src/main/resources/templates/index.html
+++ b/trusty-ui/src/main/resources/templates/index.html
@@ -1,31 +1,37 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
-<head>
+  <head>
     <title>Kogito - TrustyAI</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="shortcut icon" href="/favicon.ico"></head>
-<script>
+    <link rel="shortcut icon" href="/favicon.ico" />
+  </head>
+  <script>
     window.TRUSTY_ENDPOINT = '{config:property('kogito.trusty.http.url') or 'http://localhost:1336'}';
   </script>
-<body class="pf-m-redhat-font">
-<noscript>Enabling JavaScript is required to run this app.</noscript>
-<div id="root"></div>
-<script type="text/javascript" src="/app.bundle.js"></script></body>
+  <body class="pf-m-redhat-font">
+    <noscript>Enabling JavaScript is required to run this app.</noscript>
+    <div id="root"></div>
+    <script type="text/javascript" src="/app.bundle.js"></script>
+  </body>
 </html>
diff --git a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/KeycloakTrustyUIServiceIT.java b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/KeycloakTrustyUIServiceIT.java
index f9786bac21..a26c0c1e07 100644
--- a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/KeycloakTrustyUIServiceIT.java
+++ b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/KeycloakTrustyUIServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.ui;
 
diff --git a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
index 3f4642f922..b0a7e0c043 100644
--- a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
+++ b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.ui;
 
diff --git a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/StaticContentTest.java b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/StaticContentTest.java
index d5246fea3d..55b2a20f39 100644
--- a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/StaticContentTest.java
+++ b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/StaticContentTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.ui;
 
diff --git a/trusty-ui/src/test/resources/application.properties b/trusty-ui/src/test/resources/application.properties
index 98d16dee52..e1eb0d84dd 100644
--- a/trusty-ui/src/test/resources/application.properties
+++ b/trusty-ui/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 kogito.trusty.http.url=${KOGITO_TRUSTY_HTTP_URL:http://localhost:8180}
 
@@ -14,4 +33,7 @@ quarkus.oidc.tenant-enabled=false
 #%keycloak-test.quarkus.oidc.web-app-tenant.auth-server-url=http://localhost:8281/auth/realms/kogito
 %keycloak-test.quarkus.oidc.web-app-tenant.client-id=kogito-app
 %keycloak-test.quarkus.oidc.web-app-tenant.credentials.secret=secret
-%keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
\ No newline at end of file
+%keycloak-test.quarkus.oidc.web-app-tenant.application-type=web-app
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/trusty/pom.xml b/trusty/pom.xml
index 555f894868..4eb3e8a8b5 100644
--- a/trusty/pom.xml
+++ b/trusty/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-service/pom.xml b/trusty/trusty-service/pom.xml
index 8dc2199ff5..0e578fd08c 100644
--- a/trusty/trusty-service/pom.xml
+++ b/trusty/trusty-service/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-service/trusty-service-api/pom.xml b/trusty/trusty-service/trusty-service-api/pom.xml
index 6bc94aae68..99d23750d6 100644
--- a/trusty/trusty-service/trusty-service-api/pom.xml
+++ b/trusty/trusty-service/trusty-service-api/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
index 4eaa660e0b..7bcda7da0e 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.requests;
 
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
index e9efcb1f2c..ba283d697b 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.responses;
 
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
index 3accd19e19..3998ed525b 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.responses;
 
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionHeaderResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionHeaderResponse.java
index 4a0dac76b5..6c24c99e86 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionHeaderResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionHeaderResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 import java.time.OffsetDateTime;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionType.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionType.java
index dc99c5d369..eb98f24224 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionType.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionType.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 public enum ExecutionType {
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionsResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionsResponse.java
index 9602072c4d..bf305e2999 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionsResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/ExecutionsResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/OutcomesResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/OutcomesResponse.java
index d62e6227e4..a6dc75b57a 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/OutcomesResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/OutcomesResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SalienciesResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SalienciesResponse.java
index 5bd9ab4e40..b27b9ba70f 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SalienciesResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SalienciesResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 import java.util.List;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SaliencyResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SaliencyResponse.java
index 78b01f1c61..f4bf7b648f 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SaliencyResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/SaliencyResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 import java.util.List;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/StructuredInputsResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/StructuredInputsResponse.java
index fac41f6095..54adff1f8b 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/StructuredInputsResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/StructuredInputsResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionHeaderResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionHeaderResponse.java
index 3c7ff27d7e..c3ef917293 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionHeaderResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionHeaderResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses.decision;
 
 import java.time.OffsetDateTime;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionOutcomesResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionOutcomesResponse.java
index fe63202394..f70e6fc541 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionOutcomesResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionOutcomesResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses.decision;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionStructuredInputsResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionStructuredInputsResponse.java
index f1c9192178..1a2fc5f08f 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionStructuredInputsResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/decision/DecisionStructuredInputsResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses.decision;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessHeaderResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessHeaderResponse.java
index c01c71998d..362b3e46e0 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessHeaderResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessHeaderResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses.process;
 
 import java.time.OffsetDateTime;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessOutcomesResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessOutcomesResponse.java
index 3f8e4a8047..4eb1a00085 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessOutcomesResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessOutcomesResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses.process;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessStructuredInputsResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessStructuredInputsResponse.java
index d7118a5234..f677d56697 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessStructuredInputsResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/process/ProcessStructuredInputsResponse.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses.process;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-common/pom.xml b/trusty/trusty-service/trusty-service-common/pom.xml
index b498dd3619..4ee91b1992 100644
--- a/trusty/trusty-service/trusty-service-common/pom.xml
+++ b/trusty/trusty-service/trusty-service-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidation.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidation.java
index d94be85ac7..4b45e70489 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidation.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidation.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyService.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyService.java
index b96bceb110..0b4fc647cf 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyService.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common;
 
 import java.time.OffsetDateTime;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
index 2967daa855..24f9f0b16e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common;
 
 import java.time.OffsetDateTime;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
index f81bdc207e..84f79a4b31 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.api;
 
 import java.util.Optional;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
index e28a06dbb7..c31a31bb81 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.api;
 
 import java.time.LocalDate;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
index 5195f0b3a4..5e42440b63 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.api;
 
 import java.util.List;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandler.java
index eace70eae0..437bf1369e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
index cc66003588..d4068a31af 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
index 4c7ad9a7b2..b0a361ae54 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
index c29df8e1df..0c0c730268 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainabilityResultsManager.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainabilityResultsManager.java
index 8f3bc9ddcf..070e24a310 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainabilityResultsManager.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainabilityResultsManager.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandler.java
index bb25a3e2f5..48921c04d0 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
index d3b5bcf52e..ea0a1a2f9e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
index 38bfb8a09d..19471f3db3 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
index cc364079d9..af3cc0d2c7 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/BaseEventConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/BaseEventConsumer.java
index c2b591a04e..986c9ef0d6 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/BaseEventConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/BaseEventConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging;
 
 import java.io.IOException;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
index 36f77f0a73..7d238766e3 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
index aff5e9d225..c1518e8fa0 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
index 8787049b85..24ef1da19e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverter.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverter.java
index d91b8eea7a..959480b59c 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverter.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverter.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.util.List;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
index d48b84ec4c..87bd4862f8 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.outgoing;
 
 import java.net.URI;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/models/MatchedExecutionHeaders.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/models/MatchedExecutionHeaders.java
index 1c3b6cdd77..b0d0123ba3 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/models/MatchedExecutionHeaders.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/models/MatchedExecutionHeaders.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.models;
 
 import java.util.List;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/responses/ResponseUtils.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/responses/ResponseUtils.java
index 0ea5758041..dbe0ca9926 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/responses/ResponseUtils.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/responses/ResponseUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.responses;
 
 import java.time.Instant;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/beans.xml b/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/beans.xml
+++ b/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/microprofile-config.properties b/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/microprofile-config.properties
index eb853b0a27..da1f7f7678 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/microprofile-config.properties
+++ b/trusty/trusty-service/trusty-service-common/src/main/resources/META-INF/microprofile-config.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 #oidc
 quarkus.oidc.enabled=true
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
index 52838d1928..df11cf48a8 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common;
 
 import java.time.Instant;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
index e72955d17f..adcb55291b 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationIdenticalTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationIdenticalTest.java
index 8f8d655360..4169d17ffc 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationIdenticalTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationIdenticalTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationSubsetTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationSubsetTest.java
index 8d597fa3f3..b575386c4c 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationSubsetTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CounterfactualParameterValidationSubsetTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java
index 595e3e85a7..c860f37841 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
index 68ecd7164d..bf99e6d1d0 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
index e059b2d527..df6a168f14 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common;
 
 import java.time.OffsetDateTime;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTestUtils.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTestUtils.java
index cb502d2e1e..c6662d8396 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTestUtils.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common;
 
 import java.io.BufferedReader;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TypedValueTestUtils.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TypedValueTestUtils.java
index 0310366b2f..b3796f2fad 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TypedValueTestUtils.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TypedValueTestUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1IT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1IT.java
index 47063148f4..e4dbb732af 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1IT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1IT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.api;
 
 import java.time.Instant;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1IT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1IT.java
index 1d2adbb826..286deb82a5 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1IT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1IT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.api;
 
 import java.text.ParseException;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
index a4fc6f610b..d9b6e4cff9 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.api;
 
 import java.util.ArrayList;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
index 3c1b6d5086..851ec1f1d0 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.api;
 
 import java.util.Collections;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandlerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandlerTest.java
index 7d60ec9563..ca56d1ae6b 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandlerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/BaseExplainerServiceHandlerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicatesTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicatesTest.java
index add5d8110c..3f301161eb 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicatesTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicatesTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindowTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindowTest.java
index 2f38e01737..55313e8f20 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindowTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindowTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandlerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandlerTest.java
index 976983504d..51b7969ccc 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandlerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandlerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
index 7cf08439cd..b4a3614be6 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandlerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandlerTest.java
index 673e60a4a7..495f43d81e 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandlerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandlerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverterTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverterTest.java
index 9d61e7449e..69ad9d3261 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverterTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverterTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.common.handlers;
 
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
index e55366c275..a3abced09f 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import javax.inject.Inject;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
index 2fe3711b3b..2cab3ca97f 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import javax.inject.Inject;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/DMNModelMetadataIdentifierTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/DMNModelMetadataIdentifierTest.java
index bec1f8c89f..e5aabb0c54 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/DMNModelMetadataIdentifierTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/DMNModelMetadataIdentifierTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.util.stream.Stream;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerIT.java
index 6ea857e657..62c097be29 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.net.URI;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
index 2a02320ba8..ac7ead7d35 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.net.URI;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/KafkaConstants.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/KafkaConstants.java
index 80b9517015..b82f74a05c 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/KafkaConstants.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/KafkaConstants.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 public class KafkaConstants {
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerIT.java
index 37660844ee..f312e08671 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import org.junit.jupiter.api.AfterEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerTest.java
index 9ae4887766..df5d3aa777 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.time.Duration;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerIT.java
index e84a42d5eb..fb3f49e88a 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import org.junit.jupiter.api.AfterEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerTest.java
index 503be3d40e..b296b620a6 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.lang.reflect.Field;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverterTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverterTest.java
index 1cf020b51f..f52fa437d5 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverterTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConverterTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.util.Collections;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventTestUtils.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventTestUtils.java
index f4f48d9c9d..2567669285 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventTestUtils.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventTestUtils.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.incoming;
 
 import java.util.Collection;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java
index 39af2fb0bb..c575cca986 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.messaging.outgoing;
 
 import java.util.Collections;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
index 041bbc8091..a045439cb4 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.common.mocks;
 
 import java.util.HashMap;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/resources/META-INF/beans.xml b/trusty/trusty-service/trusty-service-common/src/test/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/resources/META-INF/beans.xml
+++ b/trusty/trusty-service/trusty-service-common/src/test/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/trusty/trusty-service/trusty-service-common/src/test/resources/application.properties b/trusty/trusty-service/trusty-service-common/src/test/resources/application.properties
index 863926fd62..b885577f37 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/resources/application.properties
+++ b/trusty/trusty-service/trusty-service-common/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 quarkus.oidc.enabled=false
 quarkus.oidc.tenant-enabled=false
@@ -32,3 +51,6 @@ mp.messaging.incoming.trusty-explainability-result.connector=smallrye-kafka
 mp.messaging.incoming.trusty-explainability-result.topic=trusty-explainability-result-test
 mp.messaging.incoming.trusty-explainability-result.value.deserializer=org.apache.kafka.common.serialization.StringDeserializer
 mp.messaging.incoming.trusty-explainability-result.auto.offset.reset=earliest
+
+# Not using Dev service in test, but rather org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource
+quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
diff --git a/trusty/trusty-service/trusty-service-infinispan/pom.xml b/trusty/trusty-service/trusty-service-infinispan/pom.xml
index 649fc27d5a..0211af54c1 100644
--- a/trusty/trusty-service/trusty-service-infinispan/pom.xml
+++ b/trusty/trusty-service/trusty-service-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/main/resources/application.properties b/trusty/trusty-service/trusty-service-infinispan/src/main/resources/application.properties
index 224c324c97..af43057b4d 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/main/resources/application.properties
+++ b/trusty/trusty-service/trusty-service-infinispan/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Container image
 quarkus.container-image.build=${quarkus.build.image:true}
 quarkus.container-image.group=org.kie.kogito
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/InfinispanTrustyServiceIT.java b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/InfinispanTrustyServiceIT.java
index 4299f2153f..b05209133a 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/InfinispanTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/InfinispanTrustyServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.infinispan;
 
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
index d50fa5075d..ea32a4820c 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.infinispan;
 
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanModelEventConsumerIT.java b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanModelEventConsumerIT.java
index e5f6b4eb88..ffeeb8b2c0 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanModelEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanModelEventConsumerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.infinispan.messaging;
 
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanTraceEventConsumerIT.java b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanTraceEventConsumerIT.java
index c7bc0bfc41..a27f705222 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanTraceEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/messaging/InfinispanTraceEventConsumerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.infinispan.messaging;
 
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/test/resources/application.properties b/trusty/trusty-service/trusty-service-infinispan/src/test/resources/application.properties
index 7fc7579aae..f556c31258 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/test/resources/application.properties
+++ b/trusty/trusty-service/trusty-service-infinispan/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 quarkus.oidc.enabled=false
 quarkus.oidc.tenant-enabled=false
diff --git a/trusty/trusty-service/trusty-service-postgresql/pom.xml b/trusty/trusty-service/trusty-service-postgresql/pom.xml
index 2136add60d..f967b1822f 100644
--- a/trusty/trusty-service/trusty-service-postgresql/pom.xml
+++ b/trusty/trusty-service/trusty-service-postgresql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-service/trusty-service-postgresql/src/main/resources/application.properties b/trusty/trusty-service/trusty-service-postgresql/src/main/resources/application.properties
index ef24c5a462..245a586f1b 100644
--- a/trusty/trusty-service/trusty-service-postgresql/src/main/resources/application.properties
+++ b/trusty/trusty-service/trusty-service-postgresql/src/main/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Container image
 quarkus.container-image.build=${quarkus.build.image:true}
 quarkus.container-image.group=org.kie.kogito
diff --git a/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/PostgreSQLTrustyServiceIT.java b/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/PostgreSQLTrustyServiceIT.java
index 5cab4fe18f..6bcd0afe00 100644
--- a/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/PostgreSQLTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/PostgreSQLTrustyServiceIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.postgresql;
 
diff --git a/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLModelEventConsumerIT.java b/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLModelEventConsumerIT.java
index d7a39cb39e..dfea23790e 100644
--- a/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLModelEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLModelEventConsumerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.postgresql.messaging;
 
diff --git a/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLTraceEventConsumerIT.java b/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLTraceEventConsumerIT.java
index d296cd5cc0..70093f646c 100644
--- a/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLTraceEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-postgresql/src/test/java/org/kie/kogito/trusty/service/postgresql/messaging/PostgreSQLTraceEventConsumerIT.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.service.postgresql.messaging;
 
diff --git a/trusty/trusty-service/trusty-service-postgresql/src/test/resources/application.properties b/trusty/trusty-service/trusty-service-postgresql/src/test/resources/application.properties
index 14ad681831..8b5680a96d 100644
--- a/trusty/trusty-service/trusty-service-postgresql/src/test/resources/application.properties
+++ b/trusty/trusty-service/trusty-service-postgresql/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # TrustyService
 trusty.explainability.enabled=false
 
diff --git a/trusty/trusty-service/trusty-service-redis/pom.xml b/trusty/trusty-service/trusty-service-redis/pom.xml
index f21e197edd..30a0a28e8c 100644
--- a/trusty/trusty-service/trusty-service-redis/pom.xml
+++ b/trusty/trusty-service/trusty-service-redis/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-service/trusty-service-redis/src/main/resources/application.properties b/trusty/trusty-service/trusty-service-redis/src/main/resources/application.properties
index 1985267a21..b4c1d850d0 100644
--- a/trusty/trusty-service/trusty-service-redis/src/main/resources/application.properties
+++ b/trusty/trusty-service/trusty-service-redis/src/main/resources/application.properties
@@ -1,2 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Redis
 kogito.apps.persistence.type=redis
\ No newline at end of file
diff --git a/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/RedisTrustyServiceIT.java b/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/RedisTrustyServiceIT.java
index 092b62b166..cf02464764 100644
--- a/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/RedisTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/RedisTrustyServiceIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.redis;
 
 import org.kie.kogito.testcontainers.quarkus.RedisQuarkusTestResource;
diff --git a/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisModelEventConsumerIT.java b/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisModelEventConsumerIT.java
index 3630bab2cd..67bbd7dfa5 100644
--- a/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisModelEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisModelEventConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.redis.messaging;
 
 import org.kie.kogito.testcontainers.quarkus.KafkaQuarkusTestResource;
diff --git a/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisTraceEventConsumerIT.java b/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisTraceEventConsumerIT.java
index 825217c191..1dfee6810d 100644
--- a/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisTraceEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-redis/src/test/java/org/kie/kogito/trusty/service/redis/messaging/RedisTraceEventConsumerIT.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.service.redis.messaging;
 
 import org.kie.kogito.testcontainers.quarkus.KafkaQuarkusTestResource;
diff --git a/trusty/trusty-service/trusty-service-redis/src/test/resources/application.properties b/trusty/trusty-service/trusty-service-redis/src/test/resources/application.properties
index b6cf8e298d..8d25c26285 100644
--- a/trusty/trusty-service/trusty-service-redis/src/test/resources/application.properties
+++ b/trusty/trusty-service/trusty-service-redis/src/test/resources/application.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 quarkus.http.cors=true
 quarkus.oidc.enabled=false
 quarkus.oidc.tenant-enabled=false
diff --git a/trusty/trusty-storage/pom.xml b/trusty/trusty-storage/pom.xml
index c97ab0139d..cb3bf05bbc 100644
--- a/trusty/trusty-storage/pom.xml
+++ b/trusty/trusty-storage/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-storage/trusty-storage-api/pom.xml b/trusty/trusty-storage/trusty-storage-api/pom.xml
index af81e2bcfa..0697bc5bd1 100644
--- a/trusty/trusty-storage/trusty-storage-api/pom.xml
+++ b/trusty/trusty-storage/trusty-storage-api/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/StorageExceptionsProvider.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/StorageExceptionsProvider.java
index b5774c0087..8624668d38 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/StorageExceptionsProvider.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/StorageExceptionsProvider.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
index b29953d326..0adc748c47 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.api.model;
 
 import java.util.Objects;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Input.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Input.java
index fbb301f5d5..2d711d5268 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Input.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Input.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelMetadata.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelMetadata.java
index 560f9c0364..f3d4078cf6 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelMetadata.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelMetadata.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.api.model;
 
 import java.util.Objects;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelWithMetadata.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelWithMetadata.java
index 91b7128f0d..e1136700b7 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelWithMetadata.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/ModelWithMetadata.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Outcome.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Outcome.java
index 8f76d01181..0f5bef409b 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Outcome.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Outcome.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelMetadata.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelMetadata.java
index bac3c4a454..c4098983b4 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelMetadata.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelMetadata.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model.decision;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelWithMetadata.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelWithMetadata.java
index ccb17b2ad9..2882786401 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelWithMetadata.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DMNModelWithMetadata.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model.decision;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
index ab95bde831..0e2f88c307 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.api.model.decision;
 
 import java.util.Collection;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionInput.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionInput.java
index ca454d6419..336019b9fa 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionInput.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionInput.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model.decision;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionOutcome.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionOutcome.java
index 5259e0298c..97b22e1026 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionOutcome.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/DecisionOutcome.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model.decision;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
index 053a6866c7..3dd0d6d2c2 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.api.model.process;
 
 import java.util.Collection;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessInput.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessInput.java
index e2ac4b812f..65bca3ba3a 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessInput.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessInput.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model.process;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessOutcome.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessOutcome.java
index bf26868385..2954721e58 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessOutcome.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/ProcessOutcome.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model.process;
 
diff --git a/trusty/trusty-storage/trusty-storage-api/src/test/java/org/kie/kogito/trusty/storage/api/model/CounterfactualDomainSerialisationTest.java b/trusty/trusty-storage/trusty-storage-api/src/test/java/org/kie/kogito/trusty/storage/api/model/CounterfactualDomainSerialisationTest.java
index 5a9b7e6d94..11b81d5e40 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/test/java/org/kie/kogito/trusty/storage/api/model/CounterfactualDomainSerialisationTest.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/test/java/org/kie/kogito/trusty/storage/api/model/CounterfactualDomainSerialisationTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.api.model;
 
diff --git a/trusty/trusty-storage/trusty-storage-common/pom.xml b/trusty/trusty-storage/trusty-storage-common/pom.xml
index 3d7034cde4..c7f9245779 100644
--- a/trusty/trusty-storage/trusty-storage-common/pom.xml
+++ b/trusty/trusty-storage/trusty-storage-common/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageService.java b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageService.java
index 2dcb097987..2a46e029d1 100644
--- a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageService.java
+++ b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.common;
 
 import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
diff --git a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
index cfb7b83403..5b466b32c1 100644
--- a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
+++ b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.common;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/trusty/trusty-storage/trusty-storage-common/src/main/resources/META-INF/beans.xml b/trusty/trusty-storage/trusty-storage-common/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/trusty/trusty-storage/trusty-storage-common/src/main/resources/META-INF/beans.xml
+++ b/trusty/trusty-storage/trusty-storage-common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/pom.xml b/trusty/trusty-storage/trusty-storage-infinispan/pom.xml
index fc03f87be8..0943d5b921 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/pom.xml
+++ b/trusty/trusty-storage/trusty-storage-infinispan/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/AbstractModelMarshaller.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/AbstractModelMarshaller.java
index b65c877cea..81d29de8f1 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/AbstractModelMarshaller.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/AbstractModelMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/Constants.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/Constants.java
index 01e91fc099..0a4b510ba1 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/Constants.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/Constants.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshaller.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshaller.java
index 00ca9d65eb..e7fe51b235 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshaller.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshaller.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshaller.java
index df0de9323a..e36ed33549 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshaller.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshaller.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshaller.java
index 541cbb86f6..aa9b16cd21 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshaller.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshaller.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshaller.java
index 2e39bcdae6..c1ed7d020c 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshaller.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshaller.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.infinispan;
 
 import java.io.IOException;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
index 155b627f83..4019b00157 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.infinispan;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshaller.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshaller.java
index 29c321440d..053218e3a9 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshaller.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshaller.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
index fdf4ff346d..46d7c59937 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.infinispan;
 
 import java.io.IOException;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/beans.xml b/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/beans.xml
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/hotrod-client.properties b/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/hotrod-client.properties
index 34ef9f5885..de44aa9a99 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/hotrod-client.properties
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/resources/META-INF/hotrod-client.properties
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 # Docker 4 Mac workaround
 # infinispan.client.hotrod.client_intelligence=BASIC
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshallerTest.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshallerTest.java
index fb42efe179..26e17ce8b1 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshallerTest.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityRequestMarshallerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshallerTest.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshallerTest.java
index 54107cf000..a92b0cb231 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshallerTest.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/CounterfactualExplainabilityResultMarshallerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshallerTest.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshallerTest.java
index bf38cfdad0..0a2bb8c66d 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshallerTest.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DMNModelWithMetadataMarshallerTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.infinispan;
 
 import java.io.IOException;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshallerTest.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshallerTest.java
index be9b2a44ea..d1d1aa9a27 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshallerTest.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/DecisionMarshallerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImplTest.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImplTest.java
index 806d444eb3..39e6115f2e 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImplTest.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshallerTest.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshallerTest.java
index f1c89a49d5..03dad1fa61 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshallerTest.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/LIMEExplainabilityResultMarshallerTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/MarshallerTestTemplate.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/MarshallerTestTemplate.java
index b7d524aada..17db52a30f 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/MarshallerTestTemplate.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/MarshallerTestTemplate.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/AbstractTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/AbstractTestField.java
index 308003f67e..b49a424fee 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/AbstractTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/AbstractTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/BooleanTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/BooleanTestField.java
index 27a92cedc8..5340d68846 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/BooleanTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/BooleanTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/CollectionTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/CollectionTestField.java
index 6d017c4abf..ff0f898285 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/CollectionTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/CollectionTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/DoubleTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/DoubleTestField.java
index 6d116ca656..5950c93bb7 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/DoubleTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/DoubleTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/EnumTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/EnumTestField.java
index dc9bdc6092..6fa2737700 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/EnumTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/EnumTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/JsonNodeTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/JsonNodeTestField.java
index 0dae08be0a..0d06ebe979 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/JsonNodeTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/JsonNodeTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ListTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ListTestField.java
index b45084df13..f1772fcd85 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ListTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ListTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/LongTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/LongTestField.java
index bdb0bdf46f..15d1449eb1 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/LongTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/LongTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MapToListTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MapToListTestField.java
index 546b32ff4d..d51bf91564 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MapToListTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MapToListTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MappedCollectionTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MappedCollectionTestField.java
index e30d7a34ca..2feb66617f 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MappedCollectionTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/MappedCollectionTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ObjectTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ObjectTestField.java
index bfc0fd6611..8e75b18e30 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ObjectTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/ObjectTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/StringTestField.java b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/StringTestField.java
index 8b7c453d15..da4121dd87 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/StringTestField.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/test/java/org/kie/kogito/trusty/storage/infinispan/testfield/StringTestField.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.infinispan.testfield;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/pom.xml b/trusty/trusty-storage/trusty-storage-postgresql/pom.xml
index e7cf9d30ca..350ef21acd 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/pom.xml
+++ b/trusty/trusty-storage/trusty-storage-postgresql/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
index 298ef70fe2..34d80b0cae 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
index d1205858cb..5d864d679a 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
index 5d426ce29b..5d32a751da 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
index c90f6527fd..d65c93d5b5 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
index c92a9a5ed6..088ac2254a 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
index 7e94f6ca65..4a96821772 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
index a39b272a85..84708d27bd 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
index 951905e114..7e78902a8e 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.postgresql;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/resources/META-INF/beans.xml b/trusty/trusty-storage/trusty-storage-postgresql/src/main/resources/META-INF/beans.xml
index 3792d5341c..ed166fabc6 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/resources/META-INF/beans.xml
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/resources/META-INF/beans.xml
@@ -1,15 +1,21 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   -->
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorageTest.java b/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorageTest.java
index b96506c74c..6a76111cfe 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorageTest.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorageTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImplTest.java b/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImplTest.java
index 43a0948bb3..8926af9b46 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImplTest.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageServiceTest.java b/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageServiceTest.java
index 89510b2103..3e2f516f7f 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageServiceTest.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/test/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageServiceTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.postgresql;
 
diff --git a/trusty/trusty-storage/trusty-storage-redis/pom.xml b/trusty/trusty-storage/trusty-storage-redis/pom.xml
index 2a90cddb77..8964498619 100644
--- a/trusty/trusty-storage/trusty-storage-redis/pom.xml
+++ b/trusty/trusty-storage/trusty-storage-redis/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
index 143ffd40fb..c27f0f9143 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.redis;
 
 import javax.annotation.PostConstruct;
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
index 8483d46ed1..a767206123 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.redis;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/main/resources/META-INF/beans.xml b/trusty/trusty-storage/trusty-storage-redis/src/main/resources/META-INF/beans.xml
index e69de29bb2..a0eb9fbf8c 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/main/resources/META-INF/beans.xml
+++ b/trusty/trusty-storage/trusty-storage-redis/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,20 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/IndexProviderTest.java b/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/IndexProviderTest.java
index d3af708073..80978b260f 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/IndexProviderTest.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/IndexProviderTest.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.redis;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisIndexManagerMock.java b/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisIndexManagerMock.java
index 15781eaa20..2d102e4b68 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisIndexManagerMock.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisIndexManagerMock.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.kie.kogito.trusty.storage.redis;
 
 import java.util.ArrayList;
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImplTest.java b/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImplTest.java
index f3837a1b1c..7379783987 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImplTest.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/test/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImplTest.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.kie.kogito.trusty.storage.redis;
 
diff --git a/ui-packages/.eslintrc.js b/ui-packages/.eslintrc.js
index 1955670878..a20e6c2355 100755
--- a/ui-packages/.eslintrc.js
+++ b/ui-packages/.eslintrc.js
@@ -1,33 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {
   root: true,
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint"],
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
   extends: [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:react/recommended",
-    "plugin:react-hooks/recommended",
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended'
   ],
   rules: {
-    "prefer-spread": "off",
-    "@typescript-eslint/no-unused-vars": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/ban-types": "off",
-    "@typescript-eslint/no-inferrable-types": "off",
-    "@typescript-eslint/no-empty-interface": ["error", { allowSingleExtends: true }],
-    "@typescript-eslint/no-empty-function": "off",
-    "no-fallthrough": "off",
-    "no-case-declarations": "off",
-    "no-unexpected-multiline": "off",
-    "react/prop-types": "off",
-    "react/display-name": "off",
-    "react/jsx-no-target-blank": "off",
+    'prefer-spread': 'off',
+    '@typescript-eslint/no-unused-vars': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/no-inferrable-types': 'off',
+    '@typescript-eslint/no-empty-interface': [
+      'error',
+      { allowSingleExtends: true }
+    ],
+    '@typescript-eslint/no-empty-function': 'off',
+    'no-fallthrough': 'off',
+    'no-case-declarations': 'off',
+    'no-unexpected-multiline': 'off',
+    'react/prop-types': 'off',
+    'react/display-name': 'off',
+    'react/jsx-no-target-blank': 'off'
   },
   settings: {
     react: {
-      version: "detect",
-    },
-  },
-};
\ No newline at end of file
+      version: 'detect'
+    }
+  }
+};
diff --git a/ui-packages/babel.config.js b/ui-packages/babel.config.js
index 8700a02734..44ed493bc6 100644
--- a/ui-packages/babel.config.js
+++ b/ui-packages/babel.config.js
@@ -1,14 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {
   presets: [
     [
-      "@babel/env",
+      '@babel/env',
       {
-        modules: "cjs",
+        modules: 'cjs',
         targets: {
-          node: "current",
-        },
-      },
+          node: 'current'
+        }
+      }
     ],
-    "@babel/react",
-  ],
+    '@babel/react'
+  ]
 };
diff --git a/ui-packages/clean-frontend.sh b/ui-packages/clean-frontend.sh
index 3a5da5daef..5cafec5ec4 100755
--- a/ui-packages/clean-frontend.sh
+++ b/ui-packages/clean-frontend.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 
 find . -type d -name 'node_modules' -prune -exec rm -rf {} \;
 find . -type d -name 'node' -prune -exec rm -rf {} \;
diff --git a/ui-packages/package.json b/ui-packages/package.json
index 2e7623a6c9..38001af4fe 100644
--- a/ui-packages/package.json
+++ b/ui-packages/package.json
@@ -18,7 +18,7 @@
     "prepare": "cd .. && husky install"
   },
   "devDependencies": {
-    "@kie-tools/dashbuilder-client": "^0.30.0",
+    "@kie-tools/dashbuilder-client": "^0.32.0",
     "@kie/lock-treatment-tool": "^0.2.4",
     "@types/node": "^18.16.19",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
@@ -47,7 +47,10 @@
     "minimatch": "^3.0.5",
     "@types/react": "17.0.5",
     "ua-parser-js": "0.7.35",
-    "yaml": "2.3.1"
+    "yaml": "2.3.1",
+    "monaco-editor": "^0.39.0",
+    "react-monaco-editor": "^0.54.0",
+    "monaco-yaml": "^4.0.4"
   },
   "engines": {
     "node": ">=18",
diff --git a/ui-packages/packages/cloud-event-form/__mocks__/monacoMock.js b/ui-packages/packages/cloud-event-form/__mocks__/monacoMock.js
index 039715b7cb..72fd39ac0a 100644
--- a/ui-packages/packages/cloud-event-form/__mocks__/monacoMock.js
+++ b/ui-packages/packages/cloud-event-form/__mocks__/monacoMock.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export default {
   languages: {
     register: function (language) {},
diff --git a/ui-packages/packages/cloud-event-form/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/cloud-event-form/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/cloud-event-form/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/cloud-event-form/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/cloud-event-form/config/Jest-config/fileMocks.js b/ui-packages/packages/cloud-event-form/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/cloud-event-form/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/cloud-event-form/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/cloud-event-form/config/Jest-config/global-setup.js b/ui-packages/packages/cloud-event-form/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/cloud-event-form/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/cloud-event-form/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/cloud-event-form/config/Jest-config/styleMocks.js b/ui-packages/packages/cloud-event-form/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/cloud-event-form/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/cloud-event-form/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/cloud-event-form/config/Jest-config/test-setup.js b/ui-packages/packages/cloud-event-form/config/Jest-config/test-setup.js
index 24e110139d..6835590294 100755
--- a/ui-packages/packages/cloud-event-form/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/cloud-event-form/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 require('jest-canvas-mock');
 const { TextDecoder } = require('util');
 
diff --git a/ui-packages/packages/cloud-event-form/config/Jest-config/test-shim.js b/ui-packages/packages/cloud-event-form/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/cloud-event-form/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/cloud-event-form/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/cloud-event-form/jest.config.js b/ui-packages/packages/cloud-event-form/jest.config.js
index afcff7fc32..850662d208 100644
--- a/ui-packages/packages/cloud-event-form/jest.config.js
+++ b/ui-packages/packages/cloud-event-form/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/cloud-event-form/package.json b/ui-packages/packages/cloud-event-form/package.json
index a3c7517e9e..0bc493e658 100644
--- a/ui-packages/packages/cloud-event-form/package.json
+++ b/ui-packages/packages/cloud-event-form/package.json
@@ -28,18 +28,16 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
-    "@patternfly/react-code-editor": "4.82.113",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",
diff --git a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormApi.ts b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormApi.ts
index 8e922f3edb..5f87d55bed 100644
--- a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormApi.ts
+++ b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface CloudEventFormApi {}
diff --git a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormChannelApi.ts b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormChannelApi.ts
index 3d91fa5ffd..b25dff6010 100644
--- a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormChannelApi.ts
+++ b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export const KOGITO_PROCESS_REFERENCE_ID = 'kogitoprocrefid';
 export const KOGITO_BUSINESS_KEY = 'kogitobusinesskey';
 
diff --git a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormDriver.ts b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormDriver.ts
index ff15b95a86..720dcff6d5 100644
--- a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormDriver.ts
+++ b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CloudEventRequest } from './CloudEventFormChannelApi';
 
 /**
diff --git a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormEnvelopeApi.ts b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormEnvelopeApi.ts
index b9abcb2519..e1189606b8 100644
--- a/ui-packages/packages/cloud-event-form/src/api/CloudEventFormEnvelopeApi.ts
+++ b/ui-packages/packages/cloud-event-form/src/api/CloudEventFormEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface CloudEventFormEnvelopeApi {
   cloudEventForm__init(
     association: Association,
diff --git a/ui-packages/packages/cloud-event-form/src/api/index.ts b/ui-packages/packages/cloud-event-form/src/api/index.ts
index 574a1dce6b..6125f1a122 100644
--- a/ui-packages/packages/cloud-event-form/src/api/index.ts
+++ b/ui-packages/packages/cloud-event-form/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './CloudEventFormApi';
 export * from './CloudEventFormChannelApi';
 export * from './CloudEventFormDriver';
diff --git a/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventForm.tsx b/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventForm.tsx
index c6ce89c474..550417d6a7 100644
--- a/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventForm.tsx
+++ b/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
diff --git a/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventFormChannelApiImpl.ts b/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventFormChannelApiImpl.ts
index fa99887863..22f86d8b59 100644
--- a/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventFormChannelApiImpl.ts
+++ b/ui-packages/packages/cloud-event-form/src/embedded/EmbeddedCloudEventFormChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CloudEventRequest,
   CloudEventFormChannelApi,
diff --git a/ui-packages/packages/cloud-event-form/src/embedded/index.ts b/ui-packages/packages/cloud-event-form/src/embedded/index.ts
index d4e32aab67..af78c5d26f 100644
--- a/ui-packages/packages/cloud-event-form/src/embedded/index.ts
+++ b/ui-packages/packages/cloud-event-form/src/embedded/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedCloudEventForm';
 export * from './EmbeddedCloudEventFormChannelApiImpl';
diff --git a/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventForm.test.tsx b/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventForm.test.tsx
index 11aaad3d0d..c816d587b8 100644
--- a/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventForm.test.tsx
+++ b/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { render } from '@testing-library/react';
 import React from 'react';
 import { EmbeddedCloudEventForm } from '../EmbeddedCloudEventForm';
diff --git a/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventFormChannelApiImpl.test.tsx b/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventFormChannelApiImpl.test.tsx
index eb35f1f782..f422aaf0f3 100644
--- a/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventFormChannelApiImpl.test.tsx
+++ b/ui-packages/packages/cloud-event-form/src/embedded/tests/EmbeddedCloudEventFormChannelApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CloudEventFormChannelApi,
   CloudEventFormDriver,
diff --git a/ui-packages/packages/cloud-event-form/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/cloud-event-form/src/embedded/tests/utils/Mocks.ts
index e2af644b32..8884a3f1ca 100644
--- a/ui-packages/packages/cloud-event-form/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/cloud-event-form/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CloudEventFormDriver } from '../../../api';
 
 export const MockedCloudEventFormDriver = jest.fn<CloudEventFormDriver, []>(
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelope.tsx b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelope.tsx
index 2361e42cd4..17a83a0c86 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelope.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeApiImpl.ts b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeApiImpl.ts
index b9728a5dd4..eaa0e1773b 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeApiImpl.ts
+++ b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import {
   Association,
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeView.tsx b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeView.tsx
index 535c9e763c..5bdad7aaff 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeView.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, {
   useEffect,
   useImperativeHandle,
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeViewDriver.tsx b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeViewDriver.tsx
index e55d92c4a6..34d881b3b0 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeViewDriver.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/CloudEventFormEnvelopeViewDriver.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   CloudEventRequest,
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/CloudEventCustomHeadersEditor.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/CloudEventCustomHeadersEditor.tsx
index f51423eb62..a0420e5929 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/CloudEventCustomHeadersEditor.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/CloudEventCustomHeadersEditor.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, {
   useCallback,
   useEffect,
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/__mocks__/CloudEventCustomHeadersEditor.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/__mocks__/CloudEventCustomHeadersEditor.tsx
index 09a19baeb9..3bf3c367d1 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/__mocks__/CloudEventCustomHeadersEditor.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/__mocks__/CloudEventCustomHeadersEditor.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { CloudEventCustomHeadersEditorApi } from '../CloudEventCustomHeadersEditor';
 import { OUIAProps } from '@kogito-apps/ouia-tools/dist/utils/OuiaUtils';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/tests/CloudEventCustomHeadersEditor.test.ts.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/tests/CloudEventCustomHeadersEditor.test.ts.tsx
index 6588465585..99a46ff35d 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/tests/CloudEventCustomHeadersEditor.test.ts.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventCustomHeadersEditor/tests/CloudEventCustomHeadersEditor.test.ts.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/CloudEventFieldLabelIcon.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/CloudEventFieldLabelIcon.tsx
index 414a16a643..eba06a6610 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/CloudEventFieldLabelIcon.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/CloudEventFieldLabelIcon.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { HelpIcon } from '@patternfly/react-icons/dist/esm/icons/help-icon';
 import { Popover } from '@patternfly/react-core/dist/js/components/Popover';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/__mocks__/CloudEventFieldLabelIcon.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/__mocks__/CloudEventFieldLabelIcon.tsx
index f67a6462bf..01f3839560 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/__mocks__/CloudEventFieldLabelIcon.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/__mocks__/CloudEventFieldLabelIcon.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedCloudEventFieldLabelIcon = (): React.ReactElement => {
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/tests/CloudEventFieldLabelIcon.test.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/tests/CloudEventFieldLabelIcon.test.tsx
index dbeb3f3c7c..745520d2a4 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/tests/CloudEventFieldLabelIcon.test.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventFieldLabelIcon/tests/CloudEventFieldLabelIcon.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import CloudEventFieldLabelIcon from '../CloudEventFieldLabelIcon';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/CloudEventForm.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/CloudEventForm.tsx
index 58a15ad67a..cc467938b8 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/CloudEventForm.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/CloudEventForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/__mocks__/CloudEventForm.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/__mocks__/CloudEventForm.tsx
index f658b9956c..6027064328 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/__mocks__/CloudEventForm.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/__mocks__/CloudEventForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedCloudEventForm = (): React.ReactElement => {
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/CloudEventForm.test.tsx b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/CloudEventForm.test.tsx
index 662ae513a0..d1f827107a 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/CloudEventForm.test.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/CloudEventForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import CloudEventForm from '../CloudEventForm';
 import { fireEvent, render, screen } from '@testing-library/react';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/validateCloudEventRequest.test.ts b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/validateCloudEventRequest.test.ts
index 6bb32e266d..3d6c29ee1f 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/validateCloudEventRequest.test.ts
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/tests/validateCloudEventRequest.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { validateCloudEventRequest } from '../validateCloudEventRequest';
 import { CloudEventMethod } from '../../../../api';
 
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/validateCloudEventRequest.ts b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/validateCloudEventRequest.ts
index d5dd1bcd25..1eb475a8d9 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/validateCloudEventRequest.ts
+++ b/ui-packages/packages/cloud-event-form/src/envelope/components/CloudEventForm/validateCloudEventRequest.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import isPlainObject from 'lodash/isPlainObject';
 import { CloudEventRequest } from '../../../api';
 
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/index.ts b/ui-packages/packages/cloud-event-form/src/envelope/index.ts
index e635ad390c..a8f7138141 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/index.ts
+++ b/ui-packages/packages/cloud-event-form/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './CloudEventFormEnvelope';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/styles.css b/ui-packages/packages/cloud-event-form/src/envelope/styles.css
index 55031302ff..3d5f73b6f2 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/styles.css
+++ b/ui-packages/packages/cloud-event-form/src/envelope/styles.css
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-cloud-event-form-container {
   height: 100%;
 }
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeApiImpl.test.tsx b/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeApiImpl.test.tsx
index 23f199161b..0dafc24cdc 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeApiImpl.test.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedCloudEventFormEnvelopeViewApi,
   MockedEnvelopeClientDefinition
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeView.test.tsx b/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeView.test.tsx
index e01403ecd7..0e4e0aa152 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeView.test.tsx
+++ b/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeViewDriver.test.ts b/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeViewDriver.test.ts
index 16c71e8f49..1dbe0068fd 100755
--- a/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/cloud-event-form/src/envelope/tests/CloudEventFormEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/tests/__snapshots__/CloudEventFormEnvelopeView.test.tsx.snap b/ui-packages/packages/cloud-event-form/src/envelope/tests/__snapshots__/CloudEventFormEnvelopeView.test.tsx.snap
index 4915e931a8..939859f1cf 100644
--- a/ui-packages/packages/cloud-event-form/src/envelope/tests/__snapshots__/CloudEventFormEnvelopeView.test.tsx.snap
+++ b/ui-packages/packages/cloud-event-form/src/envelope/tests/__snapshots__/CloudEventFormEnvelopeView.test.tsx.snap
@@ -463,7 +463,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                           aria-hidden="true"
                           class="margin-view-overlays"
                           role="presentation"
-                          style="position: absolute; width: 51px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; height: 19px;"
+                          style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 51px; height: 19px;"
                         >
                           <div
                             style="position:absolute;top:0px;width:100%;height:19px;"
@@ -473,7 +473,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                               style="width:51px; height:19px;"
                             />
                             <div
-                              class="active-line-number line-numbers"
+                              class="line-numbers active-line-number"
                               style="left:0px;width:25px;"
                             >
                               1
@@ -495,14 +495,14 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                             aria-hidden="true"
                             class="view-overlays"
                             role="presentation"
-                            style="position: absolute; height: 0px; width: 26px;"
+                            style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; height: 0px; width: 35px;"
                           >
                             <div
                               style="position:absolute;top:0px;width:100%;height:19px;"
                             >
                               <div
                                 class="current-line"
-                                style="width:26px; height:19px;"
+                                style="width:35px; height:19px;"
                               />
                             </div>
                           </div>
@@ -522,7 +522,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                             class="view-lines monaco-mouse-cursor-text"
                             data-mprt="7"
                             role="presentation"
-                            style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; width: 26px; height: 19px;"
+                            style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 35px; height: 19px;"
                           >
                             <div
                               class="view-line"
@@ -545,7 +545,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                           >
                             <div
                               class="cursor monaco-mouse-cursor-text "
-                              style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; width: 2px;"
+                              style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; padding-left: 0px; width: 2px;"
                             />
                           </div>
                         </div>
@@ -582,7 +582,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                       <div
                         aria-hidden="true"
                         role="presentation"
-                        style="width: -17px;"
+                        style="width: -9px;"
                       />
                       <textarea
                         aria-autocomplete="both"
@@ -597,7 +597,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                         data-mprt="6"
                         role="textbox"
                         spellcheck="false"
-                        style="font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
+                        style="tab-size: 20px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
                         tabindex="-1"
                         wrap="off"
                       />
@@ -609,12 +609,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                         class="overlayWidgets"
                         data-mprt="4"
                         style="width: 5px;"
-                      >
-                        <div
-                          style="position: absolute; top: 0px; right: 50%;"
-                          widgetid="editor.contrib.quickInputWidget"
-                        />
-                      </div>
+                      />
                       <div
                         aria-hidden="true"
                         class="minimap slider-mouseover"
@@ -639,7 +634,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                         />
                         <div
                           class="minimap-slider"
-                          style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: none; top: 0px; height: 0px;"
+                          style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: block; top: 0px; height: 0px;"
                         >
                           <div
                             class="minimap-slider-horizontal"
@@ -647,6 +642,11 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                           />
                         </div>
                       </div>
+                      <div
+                        aria-hidden="true"
+                        class="blockDecorations-container"
+                        role="presentation"
+                      />
                     </div>
                     <div
                       class="overflowingContentWidgets"
diff --git a/ui-packages/packages/cloud-event-form/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/cloud-event-form/src/envelope/tests/mocks/Mocks.ts
index aee5489c4e..1cb8bf8d1e 100755
--- a/ui-packages/packages/cloud-event-form/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/cloud-event-form/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/cloud-event-form/src/index.ts b/ui-packages/packages/cloud-event-form/src/index.ts
index 0cbc9249ef..b661b98a15 100644
--- a/ui-packages/packages/cloud-event-form/src/index.ts
+++ b/ui-packages/packages/cloud-event-form/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/components-common/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/components-common/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/components-common/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/components-common/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/components-common/config/Jest-config/fileMocks.js b/ui-packages/packages/components-common/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/components-common/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/components-common/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/components-common/config/Jest-config/global-setup.js b/ui-packages/packages/components-common/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/components-common/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/components-common/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/components-common/config/Jest-config/styleMocks.js b/ui-packages/packages/components-common/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/components-common/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/components-common/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/components-common/config/Jest-config/test-setup.js b/ui-packages/packages/components-common/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/components-common/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/components-common/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/components-common/config/Jest-config/test-shim.js b/ui-packages/packages/components-common/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/components-common/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/components-common/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/components-common/jest.config.js b/ui-packages/packages/components-common/jest.config.js
index 7806d26f79..3397a1126d 100644
--- a/ui-packages/packages/components-common/jest.config.js
+++ b/ui-packages/packages/components-common/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/components-common/package.json b/ui-packages/packages/components-common/package.json
index 158d63f81d..99a1d69ce2 100755
--- a/ui-packages/packages/components-common/package.json
+++ b/ui-packages/packages/components-common/package.json
@@ -34,7 +34,6 @@
     "@patternfly/react-table": "^4.113.0",
     "ajv": "^6.12.6",
     "apollo-boost": "^0.4.9",
-    "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
diff --git a/ui-packages/packages/components-common/src/components/DataTable/DataTable.tsx b/ui-packages/packages/components-common/src/components/DataTable/DataTable.tsx
index 20125b2dc1..81371bdc6f 100644
--- a/ui-packages/packages/components-common/src/components/DataTable/DataTable.tsx
+++ b/ui-packages/packages/components-common/src/components/DataTable/DataTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import { Bullseye } from '@patternfly/react-core/dist/js/layouts/Bullseye';
 import {
@@ -30,10 +32,10 @@ import isEmpty from 'lodash/isEmpty';
 import filter from 'lodash/filter';
 import sample from 'lodash/sample';
 import keys from 'lodash/keys';
+import get from 'lodash/get';
 import reduce from 'lodash/reduce';
 import isFunction from 'lodash/isFunction';
 import uuidv4 from 'uuid';
-import jp from 'jsonpath';
 import {
   OUIAProps,
   componentOuiaProps
@@ -64,7 +66,7 @@ interface IOwnProps {
 
 const getCellData = (dataObj: Record<string, unknown>, path: string) => {
   if (dataObj && path) {
-    return !isEmpty(jp.value(dataObj, path)) ? jp.value(dataObj, path) : 'N/A';
+    return get(dataObj, path) ?? 'N/A';
   } else {
     return 'N/A';
   }
@@ -94,7 +96,7 @@ const getColumns = (data: any[], columns: DataTableColumn[]) => {
           } as ICell;
         })
       : filter(keys(sample(data)), (key) => key !== '__typename').map(
-          (key) => ({ title: key, data: `$.${key}` } as ICell)
+          (key) => ({ title: key, data: key } as ICell)
         );
   } else if (columns) {
     return filter(columns, (column) => !isEmpty(column.path)).map((column) => {
diff --git a/ui-packages/packages/components-common/src/components/DataTable/__mocks__/DataTable.tsx b/ui-packages/packages/components-common/src/components/DataTable/__mocks__/DataTable.tsx
index d9946f894f..606446ad89 100644
--- a/ui-packages/packages/components-common/src/components/DataTable/__mocks__/DataTable.tsx
+++ b/ui-packages/packages/components-common/src/components/DataTable/__mocks__/DataTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockDataTable: React.FC = () => {
diff --git a/ui-packages/packages/components-common/src/components/DataTable/index.ts b/ui-packages/packages/components-common/src/components/DataTable/index.ts
index 219ad08837..3397f62eb2 100644
--- a/ui-packages/packages/components-common/src/components/DataTable/index.ts
+++ b/ui-packages/packages/components-common/src/components/DataTable/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './DataTable';
diff --git a/ui-packages/packages/components-common/src/components/DataTable/tests/DataTable.test.tsx b/ui-packages/packages/components-common/src/components/DataTable/tests/DataTable.test.tsx
index 70c42f52b9..49dca77233 100644
--- a/ui-packages/packages/components-common/src/components/DataTable/tests/DataTable.test.tsx
+++ b/ui-packages/packages/components-common/src/components/DataTable/tests/DataTable.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { DataTable, DataTableColumn } from '../DataTable';
 import { gql } from 'apollo-boost';
@@ -100,24 +102,24 @@ const stateColumnTransformer = (value) => {
 const columns: DataTableColumn[] = [
   {
     label: 'ProcessId',
-    path: '$.processId'
+    path: 'processId'
   },
   {
     label: 'Name',
-    path: '$.name',
+    path: 'name',
     isSortable: true
   },
   {
     label: 'Priority',
-    path: '$.priority'
+    path: 'priority'
   },
   {
     label: 'ProcessInstanceId',
-    path: '$.processInstanceId'
+    path: 'processInstanceId'
   },
   {
     label: 'State',
-    path: '$.state',
+    path: 'state',
     bodyCellTransformer: stateColumnTransformer,
     isSortable: true
   }
diff --git a/ui-packages/packages/components-common/src/components/EndpointLink/EndpointLink.tsx b/ui-packages/packages/components-common/src/components/EndpointLink/EndpointLink.tsx
index 4e62bad9bb..247840493c 100644
--- a/ui-packages/packages/components-common/src/components/EndpointLink/EndpointLink.tsx
+++ b/ui-packages/packages/components-common/src/components/EndpointLink/EndpointLink.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
diff --git a/ui-packages/packages/components-common/src/components/EndpointLink/index.ts b/ui-packages/packages/components-common/src/components/EndpointLink/index.ts
index 935fe39f3e..c7ba41ad1b 100644
--- a/ui-packages/packages/components-common/src/components/EndpointLink/index.ts
+++ b/ui-packages/packages/components-common/src/components/EndpointLink/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EndpointLink';
diff --git a/ui-packages/packages/components-common/src/components/EndpointLink/tests/EndpointLink.test.tsx b/ui-packages/packages/components-common/src/components/EndpointLink/tests/EndpointLink.test.tsx
index 0a7bafde9a..20f6f37f02 100644
--- a/ui-packages/packages/components-common/src/components/EndpointLink/tests/EndpointLink.test.tsx
+++ b/ui-packages/packages/components-common/src/components/EndpointLink/tests/EndpointLink.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { render, screen } from '@testing-library/react';
diff --git a/ui-packages/packages/components-common/src/components/FormFooter/FormFooter.tsx b/ui-packages/packages/components-common/src/components/FormFooter/FormFooter.tsx
index 01ae88027f..87abdb8f65 100644
--- a/ui-packages/packages/components-common/src/components/FormFooter/FormFooter.tsx
+++ b/ui-packages/packages/components-common/src/components/FormFooter/FormFooter.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import _ from 'lodash';
 import {
diff --git a/ui-packages/packages/components-common/src/components/FormFooter/__mocks__/FormFooter.tsx b/ui-packages/packages/components-common/src/components/FormFooter/__mocks__/FormFooter.tsx
index f8ca23b178..51240724fc 100644
--- a/ui-packages/packages/components-common/src/components/FormFooter/__mocks__/FormFooter.tsx
+++ b/ui-packages/packages/components-common/src/components/FormFooter/__mocks__/FormFooter.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedFormFooter = (): React.ReactElement => {
diff --git a/ui-packages/packages/components-common/src/components/FormFooter/index.ts b/ui-packages/packages/components-common/src/components/FormFooter/index.ts
index 4aefcbdf44..265b30ab71 100644
--- a/ui-packages/packages/components-common/src/components/FormFooter/index.ts
+++ b/ui-packages/packages/components-common/src/components/FormFooter/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormFooter';
diff --git a/ui-packages/packages/components-common/src/components/FormFooter/tests/FormFooter.test.tsx b/ui-packages/packages/components-common/src/components/FormFooter/tests/FormFooter.test.tsx
index 9bc15cbfc6..01993dc446 100644
--- a/ui-packages/packages/components-common/src/components/FormFooter/tests/FormFooter.test.tsx
+++ b/ui-packages/packages/components-common/src/components/FormFooter/tests/FormFooter.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ActionList } from '@patternfly/react-core/dist/js/components/ActionList';
diff --git a/ui-packages/packages/components-common/src/components/FormNotification/FormNotification.tsx b/ui-packages/packages/components-common/src/components/FormNotification/FormNotification.tsx
index d425646b2c..6e6129aeb6 100644
--- a/ui-packages/packages/components-common/src/components/FormNotification/FormNotification.tsx
+++ b/ui-packages/packages/components-common/src/components/FormNotification/FormNotification.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   Alert,
diff --git a/ui-packages/packages/components-common/src/components/FormNotification/__mocks__/FormNotification.tsx b/ui-packages/packages/components-common/src/components/FormNotification/__mocks__/FormNotification.tsx
index d004fe2c93..dafdad4f97 100644
--- a/ui-packages/packages/components-common/src/components/FormNotification/__mocks__/FormNotification.tsx
+++ b/ui-packages/packages/components-common/src/components/FormNotification/__mocks__/FormNotification.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedFormNotification = (): React.ReactElement => {
diff --git a/ui-packages/packages/components-common/src/components/FormNotification/index.ts b/ui-packages/packages/components-common/src/components/FormNotification/index.ts
index bed5db6efd..61a294e720 100644
--- a/ui-packages/packages/components-common/src/components/FormNotification/index.ts
+++ b/ui-packages/packages/components-common/src/components/FormNotification/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormNotification';
diff --git a/ui-packages/packages/components-common/src/components/FormNotification/tests/FormNotification.test.tsx b/ui-packages/packages/components-common/src/components/FormNotification/tests/FormNotification.test.tsx
index 4645049072..4e5ca29826 100644
--- a/ui-packages/packages/components-common/src/components/FormNotification/tests/FormNotification.test.tsx
+++ b/ui-packages/packages/components-common/src/components/FormNotification/tests/FormNotification.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { FormNotification, Notification } from '../FormNotification';
 import { render, screen, fireEvent } from '@testing-library/react';
diff --git a/ui-packages/packages/components-common/src/components/FormRenderer/FormRenderer.tsx b/ui-packages/packages/components-common/src/components/FormRenderer/FormRenderer.tsx
index 7f77c62242..834dfe5e42 100644
--- a/ui-packages/packages/components-common/src/components/FormRenderer/FormRenderer.tsx
+++ b/ui-packages/packages/components-common/src/components/FormRenderer/FormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import JSONSchemaBridge from 'uniforms-bridge-json-schema';
 import {
diff --git a/ui-packages/packages/components-common/src/components/FormRenderer/__mocks__/FormRenderer.tsx b/ui-packages/packages/components-common/src/components/FormRenderer/__mocks__/FormRenderer.tsx
index 4a38445f37..945663a56f 100644
--- a/ui-packages/packages/components-common/src/components/FormRenderer/__mocks__/FormRenderer.tsx
+++ b/ui-packages/packages/components-common/src/components/FormRenderer/__mocks__/FormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedFormRenderer = (): React.ReactElement => {
diff --git a/ui-packages/packages/components-common/src/components/FormRenderer/index.ts b/ui-packages/packages/components-common/src/components/FormRenderer/index.ts
index 72e2bcfe3c..3a9e872883 100644
--- a/ui-packages/packages/components-common/src/components/FormRenderer/index.ts
+++ b/ui-packages/packages/components-common/src/components/FormRenderer/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormRenderer';
diff --git a/ui-packages/packages/components-common/src/components/FormRenderer/tests/FormRenderer.test.tsx b/ui-packages/packages/components-common/src/components/FormRenderer/tests/FormRenderer.test.tsx
index 8b2d000deb..ea9613d3c3 100644
--- a/ui-packages/packages/components-common/src/components/FormRenderer/tests/FormRenderer.test.tsx
+++ b/ui-packages/packages/components-common/src/components/FormRenderer/tests/FormRenderer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import cloneDeep from 'lodash/cloneDeep';
diff --git a/ui-packages/packages/components-common/src/components/ItemDescriptor/ItemDescriptor.tsx b/ui-packages/packages/components-common/src/components/ItemDescriptor/ItemDescriptor.tsx
index de5a0bbf4e..085e7a7ac9 100644
--- a/ui-packages/packages/components-common/src/components/ItemDescriptor/ItemDescriptor.tsx
+++ b/ui-packages/packages/components-common/src/components/ItemDescriptor/ItemDescriptor.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   TextContent,
diff --git a/ui-packages/packages/components-common/src/components/ItemDescriptor/__mocks__/ItemDescriptor.tsx b/ui-packages/packages/components-common/src/components/ItemDescriptor/__mocks__/ItemDescriptor.tsx
index 1c987e8900..b5e7079278 100644
--- a/ui-packages/packages/components-common/src/components/ItemDescriptor/__mocks__/ItemDescriptor.tsx
+++ b/ui-packages/packages/components-common/src/components/ItemDescriptor/__mocks__/ItemDescriptor.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedItemDescriptor: React.FC = () => {
diff --git a/ui-packages/packages/components-common/src/components/ItemDescriptor/index.ts b/ui-packages/packages/components-common/src/components/ItemDescriptor/index.ts
index 1520b9466d..6ebdd15fd6 100644
--- a/ui-packages/packages/components-common/src/components/ItemDescriptor/index.ts
+++ b/ui-packages/packages/components-common/src/components/ItemDescriptor/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ItemDescriptor';
diff --git a/ui-packages/packages/components-common/src/components/ItemDescriptor/tests/ItemDescriptor.test.tsx b/ui-packages/packages/components-common/src/components/ItemDescriptor/tests/ItemDescriptor.test.tsx
index a594f6bac1..ac271f5cae 100644
--- a/ui-packages/packages/components-common/src/components/ItemDescriptor/tests/ItemDescriptor.test.tsx
+++ b/ui-packages/packages/components-common/src/components/ItemDescriptor/tests/ItemDescriptor.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ItemDescriptor } from '../ItemDescriptor';
diff --git a/ui-packages/packages/components-common/src/components/KogitoEmptyState/KogitoEmptyState.tsx b/ui-packages/packages/components-common/src/components/KogitoEmptyState/KogitoEmptyState.tsx
index 8a08ab6fe2..54cf5d6077 100755
--- a/ui-packages/packages/components-common/src/components/KogitoEmptyState/KogitoEmptyState.tsx
+++ b/ui-packages/packages/components-common/src/components/KogitoEmptyState/KogitoEmptyState.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   EmptyState,
diff --git a/ui-packages/packages/components-common/src/components/KogitoEmptyState/index.ts b/ui-packages/packages/components-common/src/components/KogitoEmptyState/index.ts
index 599ffde80f..faba7b346b 100644
--- a/ui-packages/packages/components-common/src/components/KogitoEmptyState/index.ts
+++ b/ui-packages/packages/components-common/src/components/KogitoEmptyState/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './KogitoEmptyState';
diff --git a/ui-packages/packages/components-common/src/components/KogitoEmptyState/tests/KogitoEmptyState.test.tsx b/ui-packages/packages/components-common/src/components/KogitoEmptyState/tests/KogitoEmptyState.test.tsx
index 6b7ad631a0..ffa664b218 100644
--- a/ui-packages/packages/components-common/src/components/KogitoEmptyState/tests/KogitoEmptyState.test.tsx
+++ b/ui-packages/packages/components-common/src/components/KogitoEmptyState/tests/KogitoEmptyState.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
diff --git a/ui-packages/packages/components-common/src/components/KogitoSpinner/KogitoSpinner.tsx b/ui-packages/packages/components-common/src/components/KogitoSpinner/KogitoSpinner.tsx
index a5ded2a922..dd02db1f27 100644
--- a/ui-packages/packages/components-common/src/components/KogitoSpinner/KogitoSpinner.tsx
+++ b/ui-packages/packages/components-common/src/components/KogitoSpinner/KogitoSpinner.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   EmptyState,
diff --git a/ui-packages/packages/components-common/src/components/KogitoSpinner/__mocks__/KogitoSpinner.tsx b/ui-packages/packages/components-common/src/components/KogitoSpinner/__mocks__/KogitoSpinner.tsx
index d64f9f0a38..b518ef3520 100644
--- a/ui-packages/packages/components-common/src/components/KogitoSpinner/__mocks__/KogitoSpinner.tsx
+++ b/ui-packages/packages/components-common/src/components/KogitoSpinner/__mocks__/KogitoSpinner.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedKogitoSpinner: React.FC = () => {
diff --git a/ui-packages/packages/components-common/src/components/KogitoSpinner/index.ts b/ui-packages/packages/components-common/src/components/KogitoSpinner/index.ts
index 3e0afd92b1..eadfc32760 100644
--- a/ui-packages/packages/components-common/src/components/KogitoSpinner/index.ts
+++ b/ui-packages/packages/components-common/src/components/KogitoSpinner/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './KogitoSpinner';
diff --git a/ui-packages/packages/components-common/src/components/KogitoSpinner/tests/KogitoSpinner.test.tsx b/ui-packages/packages/components-common/src/components/KogitoSpinner/tests/KogitoSpinner.test.tsx
index 5486bc95bd..92199f3618 100644
--- a/ui-packages/packages/components-common/src/components/KogitoSpinner/tests/KogitoSpinner.test.tsx
+++ b/ui-packages/packages/components-common/src/components/KogitoSpinner/tests/KogitoSpinner.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { KogitoSpinner } from '../KogitoSpinner';
diff --git a/ui-packages/packages/components-common/src/components/LoadMore/LoadMore.tsx b/ui-packages/packages/components-common/src/components/LoadMore/LoadMore.tsx
index 411dfea39d..f47427ad11 100644
--- a/ui-packages/packages/components-common/src/components/LoadMore/LoadMore.tsx
+++ b/ui-packages/packages/components-common/src/components/LoadMore/LoadMore.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   DataList,
diff --git a/ui-packages/packages/components-common/src/components/LoadMore/__mocks__/LoadMore.tsx b/ui-packages/packages/components-common/src/components/LoadMore/__mocks__/LoadMore.tsx
index 2255d021bf..438cc221cd 100644
--- a/ui-packages/packages/components-common/src/components/LoadMore/__mocks__/LoadMore.tsx
+++ b/ui-packages/packages/components-common/src/components/LoadMore/__mocks__/LoadMore.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedLoadMore = (): React.ReactElement => {
diff --git a/ui-packages/packages/components-common/src/components/LoadMore/index.ts b/ui-packages/packages/components-common/src/components/LoadMore/index.ts
index 65183960e5..4dab4af049 100644
--- a/ui-packages/packages/components-common/src/components/LoadMore/index.ts
+++ b/ui-packages/packages/components-common/src/components/LoadMore/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './LoadMore';
diff --git a/ui-packages/packages/components-common/src/components/LoadMore/tests/LoadMore.test.tsx b/ui-packages/packages/components-common/src/components/LoadMore/tests/LoadMore.test.tsx
index 76c2dee299..e3180fe52b 100644
--- a/ui-packages/packages/components-common/src/components/LoadMore/tests/LoadMore.test.tsx
+++ b/ui-packages/packages/components-common/src/components/LoadMore/tests/LoadMore.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { LoadMore } from '../LoadMore';
diff --git a/ui-packages/packages/components-common/src/components/ServerErrors/ServerErrors.tsx b/ui-packages/packages/components-common/src/components/ServerErrors/ServerErrors.tsx
index bb28cccb95..e1a91f4570 100644
--- a/ui-packages/packages/components-common/src/components/ServerErrors/ServerErrors.tsx
+++ b/ui-packages/packages/components-common/src/components/ServerErrors/ServerErrors.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 
 import {
diff --git a/ui-packages/packages/components-common/src/components/ServerErrors/__mocks__/ServerErrors.tsx b/ui-packages/packages/components-common/src/components/ServerErrors/__mocks__/ServerErrors.tsx
index 54857e801c..3af25b0a23 100644
--- a/ui-packages/packages/components-common/src/components/ServerErrors/__mocks__/ServerErrors.tsx
+++ b/ui-packages/packages/components-common/src/components/ServerErrors/__mocks__/ServerErrors.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedServerErrors = (): React.ReactElement => {
diff --git a/ui-packages/packages/components-common/src/components/ServerErrors/index.ts b/ui-packages/packages/components-common/src/components/ServerErrors/index.ts
index 52670f1dff..59b8f38103 100644
--- a/ui-packages/packages/components-common/src/components/ServerErrors/index.ts
+++ b/ui-packages/packages/components-common/src/components/ServerErrors/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ServerErrors';
diff --git a/ui-packages/packages/components-common/src/components/ServerErrors/tests/ServerErrors.test.tsx b/ui-packages/packages/components-common/src/components/ServerErrors/tests/ServerErrors.test.tsx
index ee24d1bf35..8c21c1553a 100644
--- a/ui-packages/packages/components-common/src/components/ServerErrors/tests/ServerErrors.test.tsx
+++ b/ui-packages/packages/components-common/src/components/ServerErrors/tests/ServerErrors.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
diff --git a/ui-packages/packages/components-common/src/components/styles.css b/ui-packages/packages/components-common/src/components/styles.css
index 80747a5971..bb5ad0784c 100644
--- a/ui-packages/packages/components-common/src/components/styles.css
+++ b/ui-packages/packages/components-common/src/components/styles.css
@@ -1,29 +1,31 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-components-common__load-more {
-    margin-bottom: var(--pf-global--spacer--lg) !important;
-    text-align: center;
+  margin-bottom: var(--pf-global--spacer--lg) !important;
+  text-align: center;
 }
 
 .pf-c-spinner .pf-m-md .kogito-components-common__load-more-spinner {
-    overflow:hidden;
-    margin-left: 5px;
+  overflow: hidden;
+  margin-left: 5px;
 }
 
 .kogito-components-common__form-footer-padding-top {
-    padding-top: 20px;
-}
\ No newline at end of file
+  padding-top: 20px;
+}
diff --git a/ui-packages/packages/components-common/src/components/utils/FormActionsUtils.tsx b/ui-packages/packages/components-common/src/components/utils/FormActionsUtils.tsx
index 07aa365c43..914107b000 100644
--- a/ui-packages/packages/components-common/src/components/utils/FormActionsUtils.tsx
+++ b/ui-packages/packages/components-common/src/components/utils/FormActionsUtils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import _ from 'lodash';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
diff --git a/ui-packages/packages/components-common/src/components/utils/FormValidator.ts b/ui-packages/packages/components-common/src/components/utils/FormValidator.ts
index fd3a64da3d..06d65edb31 100644
--- a/ui-packages/packages/components-common/src/components/utils/FormValidator.ts
+++ b/ui-packages/packages/components-common/src/components/utils/FormValidator.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import Ajv, { ValidateFunction } from 'ajv';
 import { SCHEMA_VERSION } from '../../types';
 /**
diff --git a/ui-packages/packages/components-common/src/components/utils/ModelConversionTool.ts b/ui-packages/packages/components-common/src/components/utils/ModelConversionTool.ts
index 3ecb5b91da..e5fcdb7ffb 100644
--- a/ui-packages/packages/components-common/src/components/utils/ModelConversionTool.ts
+++ b/ui-packages/packages/components-common/src/components/utils/ModelConversionTool.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export class ModelConversionTool {
   public static convertDateToString = (
     model: any,
diff --git a/ui-packages/packages/components-common/src/components/utils/index.ts b/ui-packages/packages/components-common/src/components/utils/index.ts
index f1bc1934d8..74cbe1f7ec 100644
--- a/ui-packages/packages/components-common/src/components/utils/index.ts
+++ b/ui-packages/packages/components-common/src/components/utils/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormActionsUtils';
 export * from './FormValidator';
 export * from './ModelConversionTool';
diff --git a/ui-packages/packages/components-common/src/components/utils/tests/FormValidator.test.ts b/ui-packages/packages/components-common/src/components/utils/tests/FormValidator.test.ts
index b4271e0b36..19cae48817 100644
--- a/ui-packages/packages/components-common/src/components/utils/tests/FormValidator.test.ts
+++ b/ui-packages/packages/components-common/src/components/utils/tests/FormValidator.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import cloneDeep from 'lodash/cloneDeep';
 import set from 'lodash/set';
 import { SCHEMA_VERSION } from '../../../types/types';
diff --git a/ui-packages/packages/components-common/src/components/utils/tests/ModelConversionTool.test.ts b/ui-packages/packages/components-common/src/components/utils/tests/ModelConversionTool.test.ts
index 07006ade96..d9c0929d8b 100644
--- a/ui-packages/packages/components-common/src/components/utils/tests/ModelConversionTool.test.ts
+++ b/ui-packages/packages/components-common/src/components/utils/tests/ModelConversionTool.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import _ from 'lodash';
 import { ModelConversionTool } from '../ModelConversionTool';
 
diff --git a/ui-packages/packages/components-common/src/components/utils/tests/mocks/ApplyForVisa.ts b/ui-packages/packages/components-common/src/components/utils/tests/mocks/ApplyForVisa.ts
index 65a88939a7..2d52a84705 100644
--- a/ui-packages/packages/components-common/src/components/utils/tests/mocks/ApplyForVisa.ts
+++ b/ui-packages/packages/components-common/src/components/utils/tests/mocks/ApplyForVisa.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export const ApplyForVisaForm = {
   type: 'object',
   properties: {
diff --git a/ui-packages/packages/components-common/src/index.ts b/ui-packages/packages/components-common/src/index.ts
index c24e0534d9..8400542a3b 100644
--- a/ui-packages/packages/components-common/src/index.ts
+++ b/ui-packages/packages/components-common/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './components/DataTable/DataTable';
 export * from './components/ItemDescriptor/ItemDescriptor';
 export * from './components/KogitoEmptyState/KogitoEmptyState';
diff --git a/ui-packages/packages/components-common/src/types/index.ts b/ui-packages/packages/components-common/src/types/index.ts
index 580ec85cc7..9d53b92978 100644
--- a/ui-packages/packages/components-common/src/types/index.ts
+++ b/ui-packages/packages/components-common/src/types/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './types';
diff --git a/ui-packages/packages/components-common/src/types/types.ts b/ui-packages/packages/components-common/src/types/types.ts
index 65be6e0a3d..3dc52a2693 100644
--- a/ui-packages/packages/components-common/src/types/types.ts
+++ b/ui-packages/packages/components-common/src/types/types.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export enum SCHEMA_VERSION {
   DRAFT_7 = 'http://json-schema.org/draft-07/schema#',
   DRAFT_2019_09 = 'https://json-schema.org/draft/2019-09/schema'
diff --git a/ui-packages/packages/consoles-common/codegen.yml b/ui-packages/packages/consoles-common/codegen.yml
index b85feb80b4..f142e8c594 100644
--- a/ui-packages/packages/consoles-common/codegen.yml
+++ b/ui-packages/packages/consoles-common/codegen.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 overwrite: true
 schema: "http://localhost:8180/graphql"
 documents: './src/graphql/queries.tsx'
diff --git a/ui-packages/packages/consoles-common/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/consoles-common/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/consoles-common/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/consoles-common/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/consoles-common/config/Jest-config/fileMocks.js b/ui-packages/packages/consoles-common/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/consoles-common/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/consoles-common/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/consoles-common/config/Jest-config/global-setup.js b/ui-packages/packages/consoles-common/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/consoles-common/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/consoles-common/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/consoles-common/config/Jest-config/styleMocks.js b/ui-packages/packages/consoles-common/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/consoles-common/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/consoles-common/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/consoles-common/config/Jest-config/test-setup.js b/ui-packages/packages/consoles-common/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/consoles-common/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/consoles-common/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/consoles-common/config/Jest-config/test-shim.js b/ui-packages/packages/consoles-common/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/consoles-common/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/consoles-common/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/consoles-common/config/declare.d.ts b/ui-packages/packages/consoles-common/config/declare.d.ts
index 0004da08d4..3cfbfeeca3 100644
--- a/ui-packages/packages/consoles-common/config/declare.d.ts
+++ b/ui-packages/packages/consoles-common/config/declare.d.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 declare module '*.svg' {
   const content: string;
   export default content;
diff --git a/ui-packages/packages/consoles-common/jest.config.js b/ui-packages/packages/consoles-common/jest.config.js
index 321edc0d83..39c31a8433 100644
--- a/ui-packages/packages/consoles-common/jest.config.js
+++ b/ui-packages/packages/consoles-common/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/AboutModalBox.tsx b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/AboutModalBox.tsx
index bd14240ebd..5b45e9255e 100755
--- a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/AboutModalBox.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/AboutModalBox.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { AboutModal } from '@patternfly/react-core/dist/js/components/AboutModal';
 import {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/AboutModalBox.tsx b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/AboutModalBox.tsx
index 997b91c9b7..138652cf67 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/AboutModalBox.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/AboutModalBox.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedAboutModalBox = () => {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/tabbable.js b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/tabbable.js
index d86d325edc..02d3358598 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/tabbable.js
+++ b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/__mocks__/tabbable.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const lib = jest.requireActual('tabbable');
 
 const tabbable = {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/tests/AboutModalBox.test.tsx b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/tests/AboutModalBox.test.tsx
index 100e3d3541..d6e1f4cd77 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/tests/AboutModalBox.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/AboutModalBox/tests/AboutModalBox.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import AboutModal from '../AboutModalBox';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/BrandContext/BrandContext.ts b/ui-packages/packages/consoles-common/src/components/layout/BrandContext/BrandContext.ts
index 97cd019421..595dde0500 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/BrandContext/BrandContext.ts
+++ b/ui-packages/packages/consoles-common/src/components/layout/BrandContext/BrandContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 
 export interface Brand {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/PageLayout.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/PageLayout.tsx
index 55c644b748..8e3b191520 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/PageLayout.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/PageLayout.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState, useEffect } from 'react';
 import {
   Page,
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/__mocks__/PageLayout.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/__mocks__/PageLayout.tsx
index 86eb7f6200..bdf54903b6 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/__mocks__/PageLayout.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/__mocks__/PageLayout.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedComponent = () => {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/index.ts b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/index.ts
index ac23a907d5..155b11df2d 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/index.ts
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as PageLayout } from './PageLayout';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/tests/PageLayout.test.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/tests/PageLayout.test.tsx
index 6ba6600821..2fd620f849 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageLayout/tests/PageLayout.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageLayout/tests/PageLayout.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import * as Keycloak from '../../../../utils/KeycloakClient';
 import { render, screen, fireEvent } from '@testing-library/react';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/PageSectionHeader.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/PageSectionHeader.tsx
index 3e854620a5..dc2f9097eb 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/PageSectionHeader.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/PageSectionHeader.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { Link } from 'react-router-dom';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/__mocks__/PageSectionHeader.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/__mocks__/PageSectionHeader.tsx
index 38b38b1019..747de0c55a 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/__mocks__/PageSectionHeader.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/__mocks__/PageSectionHeader.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedPageSectionHeader = () => {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/index.ts b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/index.ts
index fe0f1dbbaa..c50ac9e52b 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/index.ts
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './PageSectionHeader';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/tests/PageSectionHeader.test.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/tests/PageSectionHeader.test.tsx
index 792f91c9f9..553cbaa21b 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/tests/PageSectionHeader.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageSectionHeader/tests/PageSectionHeader.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PageSectionHeader } from '../PageSectionHeader';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/PageTitle.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/PageTitle.tsx
index 20dce09b7f..f021782799 100755
--- a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/PageTitle.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/PageTitle.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core/dist/js/layouts/Flex';
 import { Title } from '@patternfly/react-core/dist/js/components/Title';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/__mocks__/PageTitle.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/__mocks__/PageTitle.tsx
index 44b1b956e2..d7aae38ac9 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/__mocks__/PageTitle.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/__mocks__/PageTitle.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedPageTitle = (): React.ReactElement => {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/index.ts b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/index.ts
index c1f49525a9..3ca212a9f1 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/index.ts
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './PageTitle';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/tests/PageTitle.test.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/tests/PageTitle.test.tsx
index 110b2abe0a..9f6f7d940b 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageTitle/tests/PageTitle.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageTitle/tests/PageTitle.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { PageTitle } from '../PageTitle';
 import { Label } from '@patternfly/react-core/dist/js/components/Label';
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/PageToolbar.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/PageToolbar.tsx
index 3de99a8ed5..6a514ad1eb 100755
--- a/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/PageToolbar.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/PageToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   Dropdown,
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/__mocks__/PageToolbar.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/__mocks__/PageToolbar.tsx
index 926098d6c3..99bfadf380 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/__mocks__/PageToolbar.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/__mocks__/PageToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedPageToolbar = () => {
diff --git a/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/tests/PageToolbar.test.tsx b/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/tests/PageToolbar.test.tsx
index 5394e082c6..12347fdfb8 100644
--- a/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/tests/PageToolbar.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/layout/PageToolbar/tests/PageToolbar.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import PageToolbar from '../PageToolbar';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/KeycloakUnavailablePage.tsx b/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/KeycloakUnavailablePage.tsx
index 0485e8da3e..3d3fba39c7 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/KeycloakUnavailablePage.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/KeycloakUnavailablePage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Card,
   CardBody,
diff --git a/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/index.ts b/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/index.ts
index f19f7f39f4..1854d984fe 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/index.ts
+++ b/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './KeycloakUnavailablePage';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/tests/KeycloakUnavailablePage.test.tsx b/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/tests/KeycloakUnavailablePage.test.tsx
index 58486ded82..33ec9022b6 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/tests/KeycloakUnavailablePage.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/KeycloakUnavailablePage/tests/KeycloakUnavailablePage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { render, screen, fireEvent } from '@testing-library/react';
 import React from 'react';
 import { KeycloakUnavailablePage } from '../KeycloakUnavailablePage';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/NoData/NoData.tsx b/ui-packages/packages/consoles-common/src/components/pages/NoData/NoData.tsx
index 9f9d1df0f8..4016b7f3ef 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/NoData/NoData.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/NoData/NoData.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   EmptyState,
diff --git a/ui-packages/packages/consoles-common/src/components/pages/NoData/index.ts b/ui-packages/packages/consoles-common/src/components/pages/NoData/index.ts
index b6ebee2a68..b1b4cf0d41 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/NoData/index.ts
+++ b/ui-packages/packages/consoles-common/src/components/pages/NoData/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './NoData';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/NoData/tests/NoData.test.tsx b/ui-packages/packages/consoles-common/src/components/pages/NoData/tests/NoData.test.tsx
index 5322778f48..c52534e752 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/NoData/tests/NoData.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/NoData/tests/NoData.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { NoData } from '../NoData';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/PageNotFound.tsx b/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/PageNotFound.tsx
index 816f556b1a..22628be526 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/PageNotFound.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/PageNotFound.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   EmptyState,
diff --git a/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/index.ts b/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/index.ts
index dbc994061a..9f72a1b96f 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/index.ts
+++ b/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './PageNotFound';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/tests/PageNotFound.test.tsx b/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/tests/PageNotFound.test.tsx
index 39715a7941..5ff0ec73a6 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/tests/PageNotFound.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/PageNotFound/tests/PageNotFound.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { PageNotFound } from '../PageNotFound';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/ServerUnavailablePage.tsx b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/ServerUnavailablePage.tsx
index 4009a0beb8..e40ecd80cc 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/ServerUnavailablePage.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/ServerUnavailablePage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   EmptyState,
diff --git a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/__mocks__/ServerUnavailablePage.tsx b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/__mocks__/ServerUnavailablePage.tsx
index ac6f6e2dd2..a04dc5b01f 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/__mocks__/ServerUnavailablePage.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/__mocks__/ServerUnavailablePage.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/index.ts b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/index.ts
index ecad46c44c..6e308663ac 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/index.ts
+++ b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ServerUnavailablePage';
diff --git a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/tests/ServerUnavailablePage.test.tsx b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/tests/ServerUnavailablePage.test.tsx
index e5f62e9fa3..25c1b0929f 100644
--- a/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/tests/ServerUnavailablePage.test.tsx
+++ b/ui-packages/packages/consoles-common/src/components/pages/ServerUnavailablePage/tests/ServerUnavailablePage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { ServerUnavailablePage } from '../ServerUnavailablePage';
diff --git a/ui-packages/packages/consoles-common/src/components/styles.css b/ui-packages/packages/consoles-common/src/components/styles.css
index 56d7a01732..a29ed18606 100644
--- a/ui-packages/packages/consoles-common/src/components/styles.css
+++ b/ui-packages/packages/consoles-common/src/components/styles.css
@@ -1,7 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 .kogito-consoles-common--aboutModalBox .pf-c-about-modal-box__hero {
-    background-attachment: unset;
+  background-attachment: unset;
 }
 
 .kogito-consoles-common--PageLayout .pf-c-page__header-brand-link .pf-c-brand {
-    --pf-c-page__header-brand-link--c-brand--MaxHeight: 42px;
+  --pf-c-page__header-brand-link--c-brand--MaxHeight: 42px;
 }
diff --git a/ui-packages/packages/consoles-common/src/environment/auth/Auth.ts b/ui-packages/packages/consoles-common/src/environment/auth/Auth.ts
index df6a7ac819..4c753ed7f8 100644
--- a/ui-packages/packages/consoles-common/src/environment/auth/Auth.ts
+++ b/ui-packages/packages/consoles-common/src/environment/auth/Auth.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * Definition of a kogito app user.
  */
diff --git a/ui-packages/packages/consoles-common/src/environment/auth/KeycloakUserContext.ts b/ui-packages/packages/consoles-common/src/environment/auth/KeycloakUserContext.ts
index 53c8a02d7e..595e2d5657 100644
--- a/ui-packages/packages/consoles-common/src/environment/auth/KeycloakUserContext.ts
+++ b/ui-packages/packages/consoles-common/src/environment/auth/KeycloakUserContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { User, DefaultUser, LogoutUserContext } from './Auth';
 
 export interface KeycloakInfo {
diff --git a/ui-packages/packages/consoles-common/src/environment/auth/index.ts b/ui-packages/packages/consoles-common/src/environment/auth/index.ts
index d2f445eb99..c4468f3e37 100644
--- a/ui-packages/packages/consoles-common/src/environment/auth/index.ts
+++ b/ui-packages/packages/consoles-common/src/environment/auth/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './Auth';
 export * from './KeycloakUserContext';
diff --git a/ui-packages/packages/consoles-common/src/environment/auth/tests/KeycloakUserContext.test.ts b/ui-packages/packages/consoles-common/src/environment/auth/tests/KeycloakUserContext.test.ts
index 3074c3e039..b82f35fb87 100644
--- a/ui-packages/packages/consoles-common/src/environment/auth/tests/KeycloakUserContext.test.ts
+++ b/ui-packages/packages/consoles-common/src/environment/auth/tests/KeycloakUserContext.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { KeycloakUserContext } from '../KeycloakUserContext';
 import * as Keycloak from '../../../utils/KeycloakClient';
 
diff --git a/ui-packages/packages/consoles-common/src/environment/auth/tests/utils/KogitoAppContextTestingUtils.ts b/ui-packages/packages/consoles-common/src/environment/auth/tests/utils/KogitoAppContextTestingUtils.ts
index 6ccfecf641..8d8aa18c36 100644
--- a/ui-packages/packages/consoles-common/src/environment/auth/tests/utils/KogitoAppContextTestingUtils.ts
+++ b/ui-packages/packages/consoles-common/src/environment/auth/tests/utils/KogitoAppContextTestingUtils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as Keycloak from '../../../../utils/KeycloakClient';
 import * as KogitoAppContext from '../../../context/KogitoAppContext';
 import { KeycloakUserContext } from '../../KeycloakUserContext';
diff --git a/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContext.ts b/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContext.ts
index 33dcd6b663..5398e2ce62 100644
--- a/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContext.ts
+++ b/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { User, UserContext } from '../auth';
 
diff --git a/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContextProvider.tsx b/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContextProvider.tsx
index 8cfc48a4c1..c720d462b5 100644
--- a/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContextProvider.tsx
+++ b/ui-packages/packages/consoles-common/src/environment/context/KogitoAppContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { UserContext } from '../auth/Auth';
 import KogitoAppContext, { AppContextImpl } from './KogitoAppContext';
diff --git a/ui-packages/packages/consoles-common/src/environment/context/TestUserContext.ts b/ui-packages/packages/consoles-common/src/environment/context/TestUserContext.ts
index 55b89264b4..851726afbd 100644
--- a/ui-packages/packages/consoles-common/src/environment/context/TestUserContext.ts
+++ b/ui-packages/packages/consoles-common/src/environment/context/TestUserContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ANONYMOUS_USER, User, UserContext } from '../auth';
 
 export class TestUserContext implements UserContext {
diff --git a/ui-packages/packages/consoles-common/src/environment/context/index.ts b/ui-packages/packages/consoles-common/src/environment/context/index.ts
index 636b702c5d..0ea4c1a5dd 100644
--- a/ui-packages/packages/consoles-common/src/environment/context/index.ts
+++ b/ui-packages/packages/consoles-common/src/environment/context/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export {
   default as KogitoAppContext,
   AppContext,
diff --git a/ui-packages/packages/consoles-common/src/environment/context/tests/KogitoAppContextProvider.test.tsx b/ui-packages/packages/consoles-common/src/environment/context/tests/KogitoAppContextProvider.test.tsx
index e2edc397ca..ecf8ae5afa 100644
--- a/ui-packages/packages/consoles-common/src/environment/context/tests/KogitoAppContextProvider.test.tsx
+++ b/ui-packages/packages/consoles-common/src/environment/context/tests/KogitoAppContextProvider.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 
diff --git a/ui-packages/packages/consoles-common/src/graphql/index.ts b/ui-packages/packages/consoles-common/src/graphql/index.ts
index 42b1cf40a8..642e9765d0 100644
--- a/ui-packages/packages/consoles-common/src/graphql/index.ts
+++ b/ui-packages/packages/consoles-common/src/graphql/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './types';
 export * from './queries';
diff --git a/ui-packages/packages/consoles-common/src/graphql/queries.tsx b/ui-packages/packages/consoles-common/src/graphql/queries.tsx
index ad11a161ed..ceb5158b49 100644
--- a/ui-packages/packages/consoles-common/src/graphql/queries.tsx
+++ b/ui-packages/packages/consoles-common/src/graphql/queries.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import gql from 'graphql-tag';
 
 const GET_PROCESS_INSTANCES = gql`
diff --git a/ui-packages/packages/consoles-common/src/graphql/types.tsx b/ui-packages/packages/consoles-common/src/graphql/types.tsx
index a21ed23768..7358184d50 100644
--- a/ui-packages/packages/consoles-common/src/graphql/types.tsx
+++ b/ui-packages/packages/consoles-common/src/graphql/types.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /* eslint-disable */
 import gql from 'graphql-tag';
 import * as ApolloReactCommon from '@apollo/react-common';
diff --git a/ui-packages/packages/consoles-common/src/index.ts b/ui-packages/packages/consoles-common/src/index.ts
index c370635a94..085e56316b 100644
--- a/ui-packages/packages/consoles-common/src/index.ts
+++ b/ui-packages/packages/consoles-common/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './environment/context';
 export * from './environment/auth';
 export * from './utils/KeycloakClient';
diff --git a/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts b/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts
index 3869f9a08f..d97dd1d27f 100644
--- a/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts
+++ b/ui-packages/packages/consoles-common/src/utils/KeycloakClient.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import axios, { AxiosRequestConfig } from 'axios';
 import {
   ANONYMOUS_USER,
diff --git a/ui-packages/packages/consoles-common/src/utils/tests/KeycloakClient.test.ts b/ui-packages/packages/consoles-common/src/utils/tests/KeycloakClient.test.ts
index c64d1fe2f6..e1db7cc5e4 100644
--- a/ui-packages/packages/consoles-common/src/utils/tests/KeycloakClient.test.ts
+++ b/ui-packages/packages/consoles-common/src/utils/tests/KeycloakClient.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as KeycloakClient from '../KeycloakClient';
 import axios from 'axios';
 import { ANONYMOUS_USER, KeycloakUserContext } from '../../environment/auth';
diff --git a/ui-packages/packages/custom-dashboard-list/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/custom-dashboard-list/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/custom-dashboard-list/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/custom-dashboard-list/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/custom-dashboard-list/config/Jest-config/fileMocks.js b/ui-packages/packages/custom-dashboard-list/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/custom-dashboard-list/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/custom-dashboard-list/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/custom-dashboard-list/config/Jest-config/global-setup.js b/ui-packages/packages/custom-dashboard-list/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/custom-dashboard-list/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/custom-dashboard-list/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/custom-dashboard-list/config/Jest-config/styleMocks.js b/ui-packages/packages/custom-dashboard-list/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/custom-dashboard-list/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/custom-dashboard-list/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-setup.js b/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-shim.js b/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/custom-dashboard-list/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/custom-dashboard-list/jest.config.js b/ui-packages/packages/custom-dashboard-list/jest.config.js
index ffca0e2324..4b4e6a500b 100644
--- a/ui-packages/packages/custom-dashboard-list/jest.config.js
+++ b/ui-packages/packages/custom-dashboard-list/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/custom-dashboard-list/package.json b/ui-packages/packages/custom-dashboard-list/package.json
index abc79df82f..a83d2c16f3 100644
--- a/ui-packages/packages/custom-dashboard-list/package.json
+++ b/ui-packages/packages/custom-dashboard-list/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
     "@patternfly/react-core": "^4.276.8",
diff --git a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListApi.ts b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListApi.ts
index 3c7ba03cbe..f06f39651f 100644
--- a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListApi.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface CustomDashboardListApi {}
diff --git a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListChannelApi.ts b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListChannelApi.ts
index c79190bc9f..b62522080d 100755
--- a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListChannelApi.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardFilter,
   CustomDashboardInfo
diff --git a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListDriver.ts b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListDriver.ts
index 3c02553c9f..11ea18d1cd 100755
--- a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListDriver.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardFilter,
   CustomDashboardInfo
diff --git a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListEnvelopeApi.ts b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListEnvelopeApi.ts
index 3453463218..24fa86bb17 100755
--- a/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListEnvelopeApi.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/api/CustomDashboardListEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * Envelope Api
  */
diff --git a/ui-packages/packages/custom-dashboard-list/src/api/index.ts b/ui-packages/packages/custom-dashboard-list/src/api/index.ts
index 567a439b39..a696ab65a0 100644
--- a/ui-packages/packages/custom-dashboard-list/src/api/index.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './CustomDashboardListApi';
 export * from './CustomDashboardListChannelApi';
 export * from './CustomDashboardListEnvelopeApi';
diff --git a/ui-packages/packages/custom-dashboard-list/src/embedded/CustomDashboardListChannelApiImpl.ts b/ui-packages/packages/custom-dashboard-list/src/embedded/CustomDashboardListChannelApiImpl.ts
index 12277e75e4..1104aca882 100755
--- a/ui-packages/packages/custom-dashboard-list/src/embedded/CustomDashboardListChannelApiImpl.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/embedded/CustomDashboardListChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardListDriver,
   CustomDashboardListChannelApi,
diff --git a/ui-packages/packages/custom-dashboard-list/src/embedded/EmbeddedCustomDashboardList.tsx b/ui-packages/packages/custom-dashboard-list/src/embedded/EmbeddedCustomDashboardList.tsx
index f896eaff4e..2b5e14e79a 100644
--- a/ui-packages/packages/custom-dashboard-list/src/embedded/EmbeddedCustomDashboardList.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/embedded/EmbeddedCustomDashboardList.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
diff --git a/ui-packages/packages/custom-dashboard-list/src/embedded/__mocks__/EmbeddedCustomDashboardList.tsx b/ui-packages/packages/custom-dashboard-list/src/embedded/__mocks__/EmbeddedCustomDashboardList.tsx
index 998ba593c6..a53a5b7e79 100644
--- a/ui-packages/packages/custom-dashboard-list/src/embedded/__mocks__/EmbeddedCustomDashboardList.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/embedded/__mocks__/EmbeddedCustomDashboardList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedEmbeddedCustomDashboardList = (): React.ReactElement => {
diff --git a/ui-packages/packages/custom-dashboard-list/src/embedded/index.ts b/ui-packages/packages/custom-dashboard-list/src/embedded/index.ts
index e8fc19ae48..1f441c3452 100644
--- a/ui-packages/packages/custom-dashboard-list/src/embedded/index.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedCustomDashboardList';
diff --git a/ui-packages/packages/custom-dashboard-list/src/embedded/tests/CustomDashboardListChannelApiImpl.test.tsx b/ui-packages/packages/custom-dashboard-list/src/embedded/tests/CustomDashboardListChannelApiImpl.test.tsx
index a13f51e32c..bc76bb6c7f 100755
--- a/ui-packages/packages/custom-dashboard-list/src/embedded/tests/CustomDashboardListChannelApiImpl.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/embedded/tests/CustomDashboardListChannelApiImpl.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import {
   CustomDashboardFilter,
diff --git a/ui-packages/packages/custom-dashboard-list/src/embedded/tests/EmbeddedCustomDashboardList.test.tsx b/ui-packages/packages/custom-dashboard-list/src/embedded/tests/EmbeddedCustomDashboardList.test.tsx
index 8c62b53573..49cd9933ee 100644
--- a/ui-packages/packages/custom-dashboard-list/src/embedded/tests/EmbeddedCustomDashboardList.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/embedded/tests/EmbeddedCustomDashboardList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedCustomDashboardList } from '../EmbeddedCustomDashboardList';
 import { MockedCustomDashboardListDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/custom-dashboard-list/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/custom-dashboard-list/src/embedded/tests/utils/Mocks.ts
index 6079b05317..33d9419fe3 100755
--- a/ui-packages/packages/custom-dashboard-list/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CustomDashboardListDriver } from '../../../api';
 
 export const MockedCustomDashboardListDriver = jest.fn<
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelope.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelope.tsx
index 03cf0c55fc..56bee79194 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelope.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeApiImpl.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeApiImpl.ts
index 7769ab4098..468dc4f6b8 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeApiImpl.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { CustomDashboardListEnvelopeViewApi } from './CustomDashboardListEnvelopeView';
 import {
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeContext.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeContext.ts
index 5326a72031..56d8a40f9f 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeContext.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeView.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeView.tsx
index ba6c0ce30a..446682fe05 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeView.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { CustomDashboardListChannelApi } from '../api';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeViewDriver.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeViewDriver.ts
index 28e462ddda..9c177dd55e 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeViewDriver.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/CustomDashboardListEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   CustomDashboardFilter,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/CustomDashboardCard.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/CustomDashboardCard.tsx
index 7b1aafa6e5..cc0f9581b5 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/CustomDashboardCard.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/CustomDashboardCard.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/tests/CustomDashboardCard.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/tests/CustomDashboardCard.test.tsx
index a98e917a92..71dbeebb33 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/tests/CustomDashboardCard.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardCard/tests/CustomDashboardCard.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import {
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/CustomDashboardList.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/CustomDashboardList.tsx
index b7035e4bf1..960df13731 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/CustomDashboardList.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/CustomDashboardList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/CustomDashboardList.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/CustomDashboardList.tsx
index 97c53f7127..f402578644 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/CustomDashboardList.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/CustomDashboardList.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/MockData.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/MockData.ts
index f7379a185b..acec59d4bb 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/MockData.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/MockData.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CustomDashboardInfo } from '../../../../api';
 
 export const dashboardList: CustomDashboardInfo[] = [
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/TestCustomDashboardListDriver.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/TestCustomDashboardListDriver.ts
index c84cc51ca4..2dd17945b4 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/TestCustomDashboardListDriver.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/__mocks__/TestCustomDashboardListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardFilter,
   CustomDashboardInfo,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/tests/CustomDashboardList.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/tests/CustomDashboardList.test.tsx
index 34a6f93f24..90528f5842 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/tests/CustomDashboardList.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardList/tests/CustomDashboardList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import CustomDashboardList from '../CustomDashboardList';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/CustomDashboardListToolbar.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/CustomDashboardListToolbar.tsx
index bb2cf48c9f..4a5f85227f 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/CustomDashboardListToolbar.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/CustomDashboardListToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   ToolbarFilter,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/__mocks__/CustomDashboardListToolbar.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/__mocks__/CustomDashboardListToolbar.tsx
index 95d5c61234..aa87311170 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/__mocks__/CustomDashboardListToolbar.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/__mocks__/CustomDashboardListToolbar.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/tests/CustomDashboardListToolbar.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/tests/CustomDashboardListToolbar.test.tsx
index f89d9361f4..96cf87c10e 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/tests/CustomDashboardListToolbar.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListToolbar/tests/CustomDashboardListToolbar.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import CustomDashboardListToolbar from '../CustomDashboardListToolbar';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/CustomDashboardListUtils.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/CustomDashboardListUtils.tsx
index 71bdd83761..5334efd39c 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/CustomDashboardListUtils.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/CustomDashboardListUtils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import Moment from 'react-moment';
 import { DataTableColumn } from '@kogito-apps/components-common/dist/components/DataTable';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/tests/CustomDashboardListUtils.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/tests/CustomDashboardListUtils.test.tsx
index e2d5d8d639..ecf286f01e 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/tests/CustomDashboardListUtils.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardListUtils/tests/CustomDashboardListUtils.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   getDateColumn,
   getDashboardNameColumn
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/CustomDashboardsGallery.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/CustomDashboardsGallery.tsx
index 06ce93ab81..dfae4d15ab 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/CustomDashboardsGallery.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/CustomDashboardsGallery.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/__mocks__/CustomDashboardGallery.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/__mocks__/CustomDashboardGallery.tsx
index e5175e2e56..eb1012e3f3 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/__mocks__/CustomDashboardGallery.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/__mocks__/CustomDashboardGallery.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/tests/CustomDashboardGallery.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/tests/CustomDashboardGallery.test.tsx
index 5d3b6a04b5..bf95d1f205 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/tests/CustomDashboardGallery.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsGallery/tests/CustomDashboardGallery.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import CustomDashboardsGallery from '../CustomDashboardsGallery';
 import { render, screen } from '@testing-library/react';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/CustomDashboardsTable.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/CustomDashboardsTable.tsx
index f33c20ca82..810ba703ec 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/CustomDashboardsTable.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/CustomDashboardsTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import {
   DataTable,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/__mocks__/CustomDashboardsTable.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/__mocks__/CustomDashboardsTable.tsx
index 77532c2382..299b5101b5 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/__mocks__/CustomDashboardsTable.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/__mocks__/CustomDashboardsTable.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/tests/CustomDashboardsTable.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/tests/CustomDashboardsTable.test.tsx
index ea90069a71..2040560479 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/tests/CustomDashboardsTable.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/components/CustomDashboardsTable/tests/CustomDashboardsTable.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import CustomDashboardsTable from '../CustomDashboardsTable';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/index.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/index.ts
index 8b11f4b1d8..14f2f6c7f7 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/index.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './CustomDashboardListEnvelope';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeApiImpl.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeApiImpl.test.tsx
index 8dabb4ad8d..9d98376222 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeApiImpl.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedCustomDashboardListEnvelopeViewApi
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeView.test.tsx b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeView.test.tsx
index edc36feb16..8f0c43342f 100644
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeView.test.tsx
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { render, screen } from '@testing-library/react';
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeViewDriver.test.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeViewDriver.test.ts
index c8c4042089..8fa868ba5a 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/CustomDashboardListEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/MockedCustomDashboardsListDriver.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/MockedCustomDashboardsListDriver.ts
index 083e5a6ccb..14ed12648d 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/MockedCustomDashboardsListDriver.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/MockedCustomDashboardsListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardFilter,
   CustomDashboardInfo,
diff --git a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/Mocks.ts
index 564d1740e8..2ef05381c9 100755
--- a/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/custom-dashboard-list/src/index.ts b/ui-packages/packages/custom-dashboard-list/src/index.ts
index bb1a7c405e..b661b98a15 100644
--- a/ui-packages/packages/custom-dashboard-list/src/index.ts
+++ b/ui-packages/packages/custom-dashboard-list/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/custom-dashboard-view/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/custom-dashboard-view/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/custom-dashboard-view/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/custom-dashboard-view/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/custom-dashboard-view/config/Jest-config/fileMocks.js b/ui-packages/packages/custom-dashboard-view/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/custom-dashboard-view/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/custom-dashboard-view/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/custom-dashboard-view/config/Jest-config/global-setup.js b/ui-packages/packages/custom-dashboard-view/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/custom-dashboard-view/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/custom-dashboard-view/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/custom-dashboard-view/config/Jest-config/styleMocks.js b/ui-packages/packages/custom-dashboard-view/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/custom-dashboard-view/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/custom-dashboard-view/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-setup.js b/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-setup.js
index 5666d9c4a2..0f167cf2e7 100755
--- a/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 const { TextDecoder } = require('util');
 
diff --git a/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-shim.js b/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/custom-dashboard-view/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/custom-dashboard-view/jest.config.js b/ui-packages/packages/custom-dashboard-view/jest.config.js
index b03cd499c2..1d8bc612ef 100644
--- a/ui-packages/packages/custom-dashboard-view/jest.config.js
+++ b/ui-packages/packages/custom-dashboard-view/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/custom-dashboard-view/package.json b/ui-packages/packages/custom-dashboard-view/package.json
index 4b40674614..5ab374ae02 100644
--- a/ui-packages/packages/custom-dashboard-view/package.json
+++ b/ui-packages/packages/custom-dashboard-view/package.json
@@ -29,8 +29,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
     "@patternfly/react-core": "^4.276.8",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",
-    "@kie-tools/dashbuilder-client": "^0.30.0",
+    "@kie-tools/dashbuilder-client": "^0.32.0",
     "@kogito-apps/ouia-tools": "workspace:*",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^11.2.6",
diff --git a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewApi.ts b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewApi.ts
index 4eb7bd8578..5b5a886d44 100644
--- a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewApi.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface CustomDashboardViewApi {
   // custom dashboard view api
 }
diff --git a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewChannelApi.ts b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewChannelApi.ts
index d5eec58763..1b494f00ce 100755
--- a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewChannelApi.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface CustomDashboardViewChannelApi {
   customDashboardView__getCustomDashboardView(name: string): Promise<string>;
 }
diff --git a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewDriver.ts b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewDriver.ts
index 5a3f20f50a..18b16b57fe 100755
--- a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewDriver.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * Interface that defines a Driver for CustomDashboard views.
  */
diff --git a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewEnvelopeApi.ts b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewEnvelopeApi.ts
index d3a34942c8..90585f7fc4 100755
--- a/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewEnvelopeApi.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/api/CustomDashboardViewEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * Envelope Api
  */
diff --git a/ui-packages/packages/custom-dashboard-view/src/api/index.ts b/ui-packages/packages/custom-dashboard-view/src/api/index.ts
index 0b36b23c0d..374e900595 100644
--- a/ui-packages/packages/custom-dashboard-view/src/api/index.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './CustomDashboardViewApi';
 export * from './CustomDashboardViewChannelApi';
 export * from './CustomDashboardViewEnvelopeApi';
diff --git a/ui-packages/packages/custom-dashboard-view/src/dashbuilder/setup.js b/ui-packages/packages/custom-dashboard-view/src/dashbuilder/setup.js
index 754f6e6b82..760f157e3e 100644
--- a/ui-packages/packages/custom-dashboard-view/src/dashbuilder/setup.js
+++ b/ui-packages/packages/custom-dashboard-view/src/dashbuilder/setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 dashbuilder = {
   mode: 'EDITOR'
 };
diff --git a/ui-packages/packages/custom-dashboard-view/src/embedded/CustomDashboardViewChannelApiImpl.ts b/ui-packages/packages/custom-dashboard-view/src/embedded/CustomDashboardViewChannelApiImpl.ts
index 36f3004427..ed6b9704a9 100755
--- a/ui-packages/packages/custom-dashboard-view/src/embedded/CustomDashboardViewChannelApiImpl.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/embedded/CustomDashboardViewChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardViewChannelApi,
   CustomDashboardViewDriver
diff --git a/ui-packages/packages/custom-dashboard-view/src/embedded/EmbeddedCustomDashboardView.tsx b/ui-packages/packages/custom-dashboard-view/src/embedded/EmbeddedCustomDashboardView.tsx
index 844ec4a208..596190b7a1 100644
--- a/ui-packages/packages/custom-dashboard-view/src/embedded/EmbeddedCustomDashboardView.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/embedded/EmbeddedCustomDashboardView.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
diff --git a/ui-packages/packages/custom-dashboard-view/src/embedded/__mocks__/EmbeddedCustomDashboardView.tsx b/ui-packages/packages/custom-dashboard-view/src/embedded/__mocks__/EmbeddedCustomDashboardView.tsx
index 5087cc8563..5405943e67 100644
--- a/ui-packages/packages/custom-dashboard-view/src/embedded/__mocks__/EmbeddedCustomDashboardView.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/embedded/__mocks__/EmbeddedCustomDashboardView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedEmbeddedCustomDashboardView = (): React.ReactElement => {
diff --git a/ui-packages/packages/custom-dashboard-view/src/embedded/index.ts b/ui-packages/packages/custom-dashboard-view/src/embedded/index.ts
index 566c8c640c..d264f1f6ce 100644
--- a/ui-packages/packages/custom-dashboard-view/src/embedded/index.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedCustomDashboardView';
diff --git a/ui-packages/packages/custom-dashboard-view/src/embedded/tests/CustomDashboardViewChannelApiImpl.test.tsx b/ui-packages/packages/custom-dashboard-view/src/embedded/tests/CustomDashboardViewChannelApiImpl.test.tsx
index ba8e0c4545..dd65e5f334 100755
--- a/ui-packages/packages/custom-dashboard-view/src/embedded/tests/CustomDashboardViewChannelApiImpl.test.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/embedded/tests/CustomDashboardViewChannelApiImpl.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { CustomDashboardViewDriver } from '../../api';
 import { CustomDashboardViewChannelApiImpl } from '../CustomDashboardViewChannelApiImpl';
diff --git a/ui-packages/packages/custom-dashboard-view/src/embedded/tests/EmbeddedCustomDashboardView.test.tsx b/ui-packages/packages/custom-dashboard-view/src/embedded/tests/EmbeddedCustomDashboardView.test.tsx
index 484c176044..e30cc8b09b 100644
--- a/ui-packages/packages/custom-dashboard-view/src/embedded/tests/EmbeddedCustomDashboardView.test.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/embedded/tests/EmbeddedCustomDashboardView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedCustomDashboardView } from '../EmbeddedCustomDashboardView';
 import { MockedCustomDashboardViewDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/custom-dashboard-view/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/custom-dashboard-view/src/embedded/tests/utils/Mocks.ts
index f80ace3c0f..624b80d750 100755
--- a/ui-packages/packages/custom-dashboard-view/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CustomDashboardViewDriver } from '../../../api';
 
 export const MockedCustomDashboardViewDriver = jest.fn<
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelope.tsx b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelope.tsx
index 6db12c754b..35324034e2 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelope.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeApiImpl.ts b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeApiImpl.ts
index 6de73c00bd..f7f67fcbdf 100644
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeApiImpl.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { CustomDashboardViewEnvelopeViewApi } from './CustomDashboardViewEnvelopeView';
 import {
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeContext.ts b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeContext.ts
index 7437ed41ce..16ad26f53a 100644
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeContext.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeView.tsx b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeView.tsx
index 49003d601c..614ef06215 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeView.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { CustomDashboardViewChannelApi } from '../api';
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeViewDriver.ts b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeViewDriver.ts
index bd5b7dba4e..dc32523dd8 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeViewDriver.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/CustomDashboardViewEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   CustomDashboardViewChannelApi,
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/CustomDashboardView.tsx b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/CustomDashboardView.tsx
index 0957cd461f..12c711793a 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/CustomDashboardView.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/CustomDashboardView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useRef, useState } from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/__mocks__/CustomDashboardView.tsx b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/__mocks__/CustomDashboardView.tsx
index 359b5b203f..58df874038 100644
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/__mocks__/CustomDashboardView.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/__mocks__/CustomDashboardView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedCustomDashboardView = (): React.ReactElement => {
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/styles.css b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/styles.css
index a1f3b7a5fb..41e32c218f 100644
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/styles.css
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/styles.css
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-custom-dashboard-view-__card-size {
-    height: 100%
+  height: 100%;
 }
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/tests/CustomDashboardView.test.tsx b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/tests/CustomDashboardView.test.tsx
index bbe3bdeceb..5239557871 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/tests/CustomDashboardView.test.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/components/CustomDashboardView/tests/CustomDashboardView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { render, fireEvent } from '@testing-library/react';
 import React from 'react';
 import CustomDashboardView, {
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/index.ts b/ui-packages/packages/custom-dashboard-view/src/envelope/index.ts
index 4df934748a..4e135106ed 100644
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/index.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './CustomDashboardViewEnvelope';
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeApiImpl.test.tsx b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeApiImpl.test.tsx
index 599695bad6..0e1c6bbdaa 100644
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeApiImpl.test.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedCustomDashboardViewEnvelopeViewApi
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeView.test.tsx b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeView.test.tsx
index e4b508c5de..90289bf8cf 100644
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeView.test.tsx
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeViewDriver.test.ts b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeViewDriver.test.ts
index 23e4d1dda1..a7ccc33f36 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/CustomDashboardViewEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/MockedCustomDashboardsViewDriver.ts b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/MockedCustomDashboardsViewDriver.ts
index b36ef860e5..4b235a6e55 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/MockedCustomDashboardsViewDriver.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/MockedCustomDashboardsViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CustomDashboardViewDriver } from '../../../api';
 
 export class MockedCustomDashboardViewDriver
diff --git a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/Mocks.ts
index d3720d2849..4539fd94ca 100755
--- a/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/custom-dashboard-view/src/index.ts b/ui-packages/packages/custom-dashboard-view/src/index.ts
index bb1a7c405e..b661b98a15 100644
--- a/ui-packages/packages/custom-dashboard-view/src/index.ts
+++ b/ui-packages/packages/custom-dashboard-view/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/cypress-ouia/index.d.ts b/ui-packages/packages/cypress-ouia/index.d.ts
index 68b1d0144c..158a5f453c 100644
--- a/ui-packages/packages/cypress-ouia/index.d.ts
+++ b/ui-packages/packages/cypress-ouia/index.d.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 // need to keep triple slash directive here, Cypress does not handle well imports.
 /// <reference types="cypress" />
 
diff --git a/ui-packages/packages/cypress-ouia/src/index.ts b/ui-packages/packages/cypress-ouia/src/index.ts
index feb3a9d9c6..a0b7df5ac6 100644
--- a/ui-packages/packages/cypress-ouia/src/index.ts
+++ b/ui-packages/packages/cypress-ouia/src/index.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 // ***********************************************
 // This example commands.js shows you how to
 // create various custom commands and overwrite
diff --git a/ui-packages/packages/form-details/__mocks__/monacoMock.js b/ui-packages/packages/form-details/__mocks__/monacoMock.js
index 640dd2a004..9d985d8ba1 100644
--- a/ui-packages/packages/form-details/__mocks__/monacoMock.js
+++ b/ui-packages/packages/form-details/__mocks__/monacoMock.js
@@ -1,10 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {
-    languages: {
-      register: function(language) {},
-      setMonarchTokensProvider: function(name, tokens) {},
-      registerCompletionItemProvider: function(name, provider) {}
-    },
-    editor: {
-      defineTheme: function(name, theme) {}
-    }
-  };
\ No newline at end of file
+  languages: {
+    register: function (language) {},
+    setMonarchTokensProvider: function (name, tokens) {},
+    registerCompletionItemProvider: function (name, provider) {}
+  },
+  editor: {
+    defineTheme: function (name, theme) {}
+  }
+};
diff --git a/ui-packages/packages/form-details/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/form-details/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/form-details/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/form-details/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/form-details/config/Jest-config/fileMocks.js b/ui-packages/packages/form-details/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/form-details/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/form-details/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/form-details/config/Jest-config/global-setup.js b/ui-packages/packages/form-details/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/form-details/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/form-details/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/form-details/config/Jest-config/styleMocks.js b/ui-packages/packages/form-details/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/form-details/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/form-details/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/form-details/config/Jest-config/test-setup.js b/ui-packages/packages/form-details/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/form-details/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/form-details/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/form-details/config/Jest-config/test-shim.js b/ui-packages/packages/form-details/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/form-details/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/form-details/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/form-details/package.json b/ui-packages/packages/form-details/package.json
index 89a81036e1..7894ff2899 100644
--- a/ui-packages/packages/form-details/package.json
+++ b/ui-packages/packages/form-details/package.json
@@ -28,20 +28,18 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/form-displayer": "workspace:*",
     "@kogito-apps/forms-list": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
-    "@patternfly/react-code-editor": "4.82.113",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",
diff --git a/ui-packages/packages/form-details/src/api/FormDetailsApi.ts b/ui-packages/packages/form-details/src/api/FormDetailsApi.ts
index 03cd4ea3e5..dec115d8ec 100755
--- a/ui-packages/packages/form-details/src/api/FormDetailsApi.ts
+++ b/ui-packages/packages/form-details/src/api/FormDetailsApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface FormDetailsApi {
   // forms details api
 }
diff --git a/ui-packages/packages/form-details/src/api/FormDetailsChannelApi.ts b/ui-packages/packages/form-details/src/api/FormDetailsChannelApi.ts
index 06e224c117..626d9c47a7 100755
--- a/ui-packages/packages/form-details/src/api/FormDetailsChannelApi.ts
+++ b/ui-packages/packages/form-details/src/api/FormDetailsChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { Form, FormContent } from './FormDetailsEnvelopeApi';
 
 /**
diff --git a/ui-packages/packages/form-details/src/api/FormDetailsDriver.ts b/ui-packages/packages/form-details/src/api/FormDetailsDriver.ts
index ee33fab901..d8e3e953e2 100755
--- a/ui-packages/packages/form-details/src/api/FormDetailsDriver.ts
+++ b/ui-packages/packages/form-details/src/api/FormDetailsDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { Form, FormContent } from './FormDetailsEnvelopeApi';
 
 /**
diff --git a/ui-packages/packages/form-details/src/api/FormDetailsEnvelopeApi.ts b/ui-packages/packages/form-details/src/api/FormDetailsEnvelopeApi.ts
index f42a84d037..c198b4008b 100755
--- a/ui-packages/packages/form-details/src/api/FormDetailsEnvelopeApi.ts
+++ b/ui-packages/packages/form-details/src/api/FormDetailsEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormInfo } from '@kogito-apps/forms-list';
 
 /**
diff --git a/ui-packages/packages/form-details/src/api/index.ts b/ui-packages/packages/form-details/src/api/index.ts
index 3b0463edc1..8e59fdfeef 100644
--- a/ui-packages/packages/form-details/src/api/index.ts
+++ b/ui-packages/packages/form-details/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormDetailsApi';
 export * from './FormDetailsChannelApi';
 export * from './FormDetailsEnvelopeApi';
diff --git a/ui-packages/packages/form-details/src/embedded/EmbeddedFormDetails.tsx b/ui-packages/packages/form-details/src/embedded/EmbeddedFormDetails.tsx
index de36977c28..160bee3ca4 100755
--- a/ui-packages/packages/form-details/src/embedded/EmbeddedFormDetails.tsx
+++ b/ui-packages/packages/form-details/src/embedded/EmbeddedFormDetails.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
diff --git a/ui-packages/packages/form-details/src/embedded/FormDetailsChannelApiImpl.ts b/ui-packages/packages/form-details/src/embedded/FormDetailsChannelApiImpl.ts
index b8a6b83d82..083901822d 100644
--- a/ui-packages/packages/form-details/src/embedded/FormDetailsChannelApiImpl.ts
+++ b/ui-packages/packages/form-details/src/embedded/FormDetailsChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   FormDetailsDriver,
   FormDetailsChannelApi,
diff --git a/ui-packages/packages/form-details/src/embedded/__mocks__/EmbeddedFormDetails.tsx b/ui-packages/packages/form-details/src/embedded/__mocks__/EmbeddedFormDetails.tsx
index 63959f5201..8674d17aca 100644
--- a/ui-packages/packages/form-details/src/embedded/__mocks__/EmbeddedFormDetails.tsx
+++ b/ui-packages/packages/form-details/src/embedded/__mocks__/EmbeddedFormDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedEmbeddedFormDetails = (): React.ReactElement => {
diff --git a/ui-packages/packages/form-details/src/embedded/index.ts b/ui-packages/packages/form-details/src/embedded/index.ts
index fb05b2b91d..135c0d73fe 100644
--- a/ui-packages/packages/form-details/src/embedded/index.ts
+++ b/ui-packages/packages/form-details/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedFormDetails';
diff --git a/ui-packages/packages/form-details/src/embedded/tests/EmbeddedFormDetails.test.tsx b/ui-packages/packages/form-details/src/embedded/tests/EmbeddedFormDetails.test.tsx
index f13536259e..c5ecb94c32 100644
--- a/ui-packages/packages/form-details/src/embedded/tests/EmbeddedFormDetails.test.tsx
+++ b/ui-packages/packages/form-details/src/embedded/tests/EmbeddedFormDetails.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedFormDetails } from '../EmbeddedFormDetails';
 import { MockedFormDetailsDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/form-details/src/embedded/tests/FormDetailsChannelApiImpl.test.tsx b/ui-packages/packages/form-details/src/embedded/tests/FormDetailsChannelApiImpl.test.tsx
index 6b772884ff..5dea30d53a 100755
--- a/ui-packages/packages/form-details/src/embedded/tests/FormDetailsChannelApiImpl.test.tsx
+++ b/ui-packages/packages/form-details/src/embedded/tests/FormDetailsChannelApiImpl.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { FormDetailsDriver } from '../../api';
 import { FormDetailsChannelApiImpl } from '../FormDetailsChannelApiImpl';
diff --git a/ui-packages/packages/form-details/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/form-details/src/embedded/tests/utils/Mocks.ts
index fd453dccd5..399229f17b 100755
--- a/ui-packages/packages/form-details/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/form-details/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormDetailsDriver } from '../../../api';
 
 export const MockedFormDetailsDriver = jest.fn<FormDetailsDriver, []>(() => ({
diff --git a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelope.tsx b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelope.tsx
index 38bdc086ce..76c86d31e0 100644
--- a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelope.tsx
+++ b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeApiImpl.ts b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeApiImpl.ts
index c021927c72..a66dba607c 100755
--- a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeApiImpl.ts
+++ b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { FormDetailsEnvelopeViewApi } from './FormDetailsEnvelopeView';
 import {
diff --git a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeContext.ts b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeContext.ts
index b8d0063fe7..180745695f 100644
--- a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeContext.ts
+++ b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeView.tsx b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeView.tsx
index 3055bf6c9f..e1b05b2fb4 100755
--- a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeView.tsx
+++ b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { FormDetailsChannelApi } from '../api';
diff --git a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeViewDriver.ts b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeViewDriver.ts
index 85167cccd8..1b406f255a 100644
--- a/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeViewDriver.ts
+++ b/ui-packages/packages/form-details/src/envelope/FormDetailsEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   Form,
diff --git a/ui-packages/packages/form-details/src/envelope/components/FormDetails/FormDetails.tsx b/ui-packages/packages/form-details/src/envelope/components/FormDetails/FormDetails.tsx
index 0878b7796f..3b06ea71a9 100755
--- a/ui-packages/packages/form-details/src/envelope/components/FormDetails/FormDetails.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/FormDetails/FormDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useRef, useState } from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/form-details/src/envelope/components/FormDetails/__mocks__/FormDetails.tsx b/ui-packages/packages/form-details/src/envelope/components/FormDetails/__mocks__/FormDetails.tsx
index 418408f244..99b6877d8e 100644
--- a/ui-packages/packages/form-details/src/envelope/components/FormDetails/__mocks__/FormDetails.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/FormDetails/__mocks__/FormDetails.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/form-details/src/envelope/components/FormDetails/tests/FormDetails.test.tsx b/ui-packages/packages/form-details/src/envelope/components/FormDetails/tests/FormDetails.test.tsx
index b4f49856b9..5c83fd07e6 100755
--- a/ui-packages/packages/form-details/src/envelope/components/FormDetails/tests/FormDetails.test.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/FormDetails/tests/FormDetails.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import FormDetails from '../FormDetails';
diff --git a/ui-packages/packages/form-details/src/envelope/components/FormEditor/FormEditor.tsx b/ui-packages/packages/form-details/src/envelope/components/FormEditor/FormEditor.tsx
index 6a7450ba9f..ec125d8a4b 100644
--- a/ui-packages/packages/form-details/src/envelope/components/FormEditor/FormEditor.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/FormEditor/FormEditor.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/form-details/src/envelope/components/FormEditor/__mocks__/FormEditor.tsx b/ui-packages/packages/form-details/src/envelope/components/FormEditor/__mocks__/FormEditor.tsx
index 81e901bf49..1ed9c73fbc 100644
--- a/ui-packages/packages/form-details/src/envelope/components/FormEditor/__mocks__/FormEditor.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/FormEditor/__mocks__/FormEditor.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { FormEditorProps } from '../FormEditor';
diff --git a/ui-packages/packages/form-details/src/envelope/components/FormEditor/tests/FormEditor.test.tsx b/ui-packages/packages/form-details/src/envelope/components/FormEditor/tests/FormEditor.test.tsx
index 24df796fa9..a78868b2c2 100644
--- a/ui-packages/packages/form-details/src/envelope/components/FormEditor/tests/FormEditor.test.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/FormEditor/tests/FormEditor.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import FormEditor from '../FormEditor';
diff --git a/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContext.tsx b/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContext.tsx
index 1c4a8b2969..c40c649865 100644
--- a/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContext.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContext.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { Form } from '../../../api';
 
diff --git a/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContextProvider.tsx b/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContextProvider.tsx
index bc24b3b6e8..7ee077fa80 100644
--- a/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContextProvider.tsx
+++ b/ui-packages/packages/form-details/src/envelope/components/contexts/FormDetailsContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import RuntimeToolsFormDetailsContext, {
   FormDetailsContextImpl
diff --git a/ui-packages/packages/form-details/src/envelope/components/styles.css b/ui-packages/packages/form-details/src/envelope/components/styles.css
index 18a2cfdf88..5615fada44 100644
--- a/ui-packages/packages/form-details/src/envelope/components/styles.css
+++ b/ui-packages/packages/form-details/src/envelope/components/styles.css
@@ -1,23 +1,25 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .pf-c-code-editor__controls > button:nth-child(1) {
-    color: #06c !important;
+  color: #06c !important;
 }
 
 .kogito-form-details-container {
-    height: 100%;
-}
\ No newline at end of file
+  height: 100%;
+}
diff --git a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/FormDisplayerContainer.tsx b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/FormDisplayerContainer.tsx
index b2e9e98c48..5f9e427503 100644
--- a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/FormDisplayerContainer.tsx
+++ b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/FormDisplayerContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import uuidv4 from 'uuid';
 import {
diff --git a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/__mocks__/FormDisplayerContainer.tsx b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/__mocks__/FormDisplayerContainer.tsx
index 92964b4e74..df42cc16ed 100644
--- a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/__mocks__/FormDisplayerContainer.tsx
+++ b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/__mocks__/FormDisplayerContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/tests/FormDisplayerContainer.test.tsx b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/tests/FormDisplayerContainer.test.tsx
index aad1db33da..ad7b37a71a 100644
--- a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/tests/FormDisplayerContainer.test.tsx
+++ b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/tests/FormDisplayerContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import FormDisplayerContainer from '../FormDisplayerContainer';
diff --git a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/utils/utils.ts b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/utils/utils.ts
index a99ad80630..e8ff0c35ba 100644
--- a/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/utils/utils.ts
+++ b/ui-packages/packages/form-details/src/envelope/containers/FormDisplayerContainer/utils/utils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { Form } from '../../../../api';
 
 import uuidv4 from 'uuid';
diff --git a/ui-packages/packages/form-details/src/envelope/index.ts b/ui-packages/packages/form-details/src/envelope/index.ts
index 329ccd44bb..91b8d54901 100644
--- a/ui-packages/packages/form-details/src/envelope/index.ts
+++ b/ui-packages/packages/form-details/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormDetailsEnvelope';
diff --git a/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeApiImpl.test.tsx b/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeApiImpl.test.tsx
index 34e8385e81..fc1a21b44e 100644
--- a/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeApiImpl.test.tsx
+++ b/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedFormDetailsEnvelopeViewApi
diff --git a/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeView.test.tsx b/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeView.test.tsx
index aa29aa0acb..63f4e0974f 100644
--- a/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeView.test.tsx
+++ b/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeViewDriver.test.ts b/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeViewDriver.test.ts
index 8aeebe1758..c597452807 100755
--- a/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/form-details/src/envelope/tests/FormDetailsEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/form-details/src/envelope/tests/mocks/MockedFormDetailsDriver.ts b/ui-packages/packages/form-details/src/envelope/tests/mocks/MockedFormDetailsDriver.ts
index 1335832558..2fec5216c1 100755
--- a/ui-packages/packages/form-details/src/envelope/tests/mocks/MockedFormDetailsDriver.ts
+++ b/ui-packages/packages/form-details/src/envelope/tests/mocks/MockedFormDetailsDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { Form, FormContent, FormDetailsDriver } from '../../../api';
 
 export const formContent: Form = {
diff --git a/ui-packages/packages/form-details/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/form-details/src/envelope/tests/mocks/Mocks.ts
index 4de1695b5d..9e65575b4d 100755
--- a/ui-packages/packages/form-details/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/form-details/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/form-details/src/index.ts b/ui-packages/packages/form-details/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/form-details/src/index.ts
+++ b/ui-packages/packages/form-details/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/form-displayer/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/form-displayer/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/form-displayer/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/form-displayer/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/form-displayer/config/Jest-config/fileMocks.js b/ui-packages/packages/form-displayer/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/form-displayer/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/form-displayer/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/form-displayer/config/Jest-config/global-setup.js b/ui-packages/packages/form-displayer/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/form-displayer/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/form-displayer/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/form-displayer/config/Jest-config/styleMocks.js b/ui-packages/packages/form-displayer/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/form-displayer/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/form-displayer/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/form-displayer/config/Jest-config/test-setup.js b/ui-packages/packages/form-displayer/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/form-displayer/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/form-displayer/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/form-displayer/config/Jest-config/test-shim.js b/ui-packages/packages/form-displayer/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/form-displayer/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/form-displayer/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/form-displayer/package.json b/ui-packages/packages/form-displayer/package.json
index 7c7b87b7e7..86a3dbca73 100644
--- a/ui-packages/packages/form-displayer/package.json
+++ b/ui-packages/packages/form-displayer/package.json
@@ -30,8 +30,8 @@
   "dependencies": {
     "@babel/standalone": "7.15.3",
     "@emotion/core": "^10.3.1",
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
     "@patternfly/react-core": "^4.276.8",
diff --git a/ui-packages/packages/form-displayer/src/api/FormDisplayerApi.ts b/ui-packages/packages/form-displayer/src/api/FormDisplayerApi.ts
index c2e5eefc03..a8e213eaf3 100644
--- a/ui-packages/packages/form-displayer/src/api/FormDisplayerApi.ts
+++ b/ui-packages/packages/form-displayer/src/api/FormDisplayerApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   FormDisplayerInitArgs,
   FormSubmitContext,
diff --git a/ui-packages/packages/form-displayer/src/api/FormDisplayerChannelApi.ts b/ui-packages/packages/form-displayer/src/api/FormDisplayerChannelApi.ts
index e7a12fccc4..3d220dbb33 100644
--- a/ui-packages/packages/form-displayer/src/api/FormDisplayerChannelApi.ts
+++ b/ui-packages/packages/form-displayer/src/api/FormDisplayerChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormOpened } from './types';
 
 export interface FormDisplayerChannelApi {
diff --git a/ui-packages/packages/form-displayer/src/api/FormDisplayerEnvelopeApi.ts b/ui-packages/packages/form-displayer/src/api/FormDisplayerEnvelopeApi.ts
index e19a3d81d8..785f15f519 100644
--- a/ui-packages/packages/form-displayer/src/api/FormDisplayerEnvelopeApi.ts
+++ b/ui-packages/packages/form-displayer/src/api/FormDisplayerEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Association,
   FormDisplayerInitArgs,
diff --git a/ui-packages/packages/form-displayer/src/api/index.ts b/ui-packages/packages/form-displayer/src/api/index.ts
index 33e4ea632c..828ccc4948 100644
--- a/ui-packages/packages/form-displayer/src/api/index.ts
+++ b/ui-packages/packages/form-displayer/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './types';
 export * from './FormDisplayerApi';
 export * from './FormDisplayerChannelApi';
diff --git a/ui-packages/packages/form-displayer/src/api/types.ts b/ui-packages/packages/form-displayer/src/api/types.ts
index 1903bd309d..2da27ecbd7 100644
--- a/ui-packages/packages/form-displayer/src/api/types.ts
+++ b/ui-packages/packages/form-displayer/src/api/types.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface FormDisplayerInitArgs {
   form: Form;
   data?: any;
diff --git a/ui-packages/packages/form-displayer/src/embedded/EmbeddedFormDisplayer.tsx b/ui-packages/packages/form-displayer/src/embedded/EmbeddedFormDisplayer.tsx
index abbb29040d..fe4864cb9b 100644
--- a/ui-packages/packages/form-displayer/src/embedded/EmbeddedFormDisplayer.tsx
+++ b/ui-packages/packages/form-displayer/src/embedded/EmbeddedFormDisplayer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import {
   FormDisplayerApi,
diff --git a/ui-packages/packages/form-displayer/src/embedded/index.ts b/ui-packages/packages/form-displayer/src/embedded/index.ts
index 5cfa9aa138..6fb00d4ea9 100644
--- a/ui-packages/packages/form-displayer/src/embedded/index.ts
+++ b/ui-packages/packages/form-displayer/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedFormDisplayer';
diff --git a/ui-packages/packages/form-displayer/src/embedded/tests/EmbeddedFormDisplayer.test.tsx b/ui-packages/packages/form-displayer/src/embedded/tests/EmbeddedFormDisplayer.test.tsx
index 8afe1a4dc2..d8694fde0a 100644
--- a/ui-packages/packages/form-displayer/src/embedded/tests/EmbeddedFormDisplayer.test.tsx
+++ b/ui-packages/packages/form-displayer/src/embedded/tests/EmbeddedFormDisplayer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedFormDisplayer } from '../EmbeddedFormDisplayer';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelope.tsx b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelope.tsx
index b34ebeb0b3..8c3ea96d4a 100644
--- a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelope.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeApiImpl.ts b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeApiImpl.ts
index ff00127b16..6180def895 100644
--- a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeApiImpl.ts
+++ b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import {
   Association,
diff --git a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeContext.ts b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeContext.ts
index a040e4dc86..56f1f56b45 100644
--- a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeContext.ts
+++ b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeContext.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface FormDisplayerEnvelopeContext {}
diff --git a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeView.tsx b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeView.tsx
index d5f8667e9e..7423d79ee6 100644
--- a/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeView.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/FormDisplayerEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import { useImperativeHandle, useRef, useState } from 'react';
 import isEmpty from 'lodash/isEmpty';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/ErrorBoundary.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/ErrorBoundary.tsx
index 34238be829..f3e82d7f73 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/ErrorBoundary.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/ErrorBoundary.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { ErrorInfo } from 'react';
 import FormErrorsWrapper from '../FormErrorsWrapper/FormErrorsWrapper';
 import { FormOpened, FormOpenedState } from '../../../api';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/tests/ErrorBoundary.test.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/tests/ErrorBoundary.test.tsx
index 1c20db9f64..0eb53d1798 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/tests/ErrorBoundary.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ErrorBoundary/tests/ErrorBoundary.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import ErrorBoundary from '../ErrorBoundary';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/FormDisplayer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/FormDisplayer.tsx
index 58e40c2476..6850cad820 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/FormDisplayer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/FormDisplayer.tsx
@@ -1,23 +1,25 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, {
-  useCallback,
   useEffect,
   useImperativeHandle,
+  useMemo,
   useState
 } from 'react';
 import { Bullseye } from '@patternfly/react-core/dist/js/layouts/Bullseye';
@@ -73,7 +75,7 @@ export const FormDisplayer = React.forwardRef<
       return api;
     };
 
-    const canDisplayForm = useCallback(() => {
+    const canDisplayForm = useMemo(() => {
       return isEnvelopeConnectedToChannel && !isExecuting && source;
     }, [isEnvelopeConnectedToChannel, isExecuting, source]);
 
@@ -114,7 +116,7 @@ export const FormDisplayer = React.forwardRef<
 
     return (
       <div {...componentOuiaProps(ouiaId, 'form-displayer', ouiaSafe)}>
-        {canDisplayForm() ? (
+        {canDisplayForm ? (
           <div id={'inner-form-container'}>
             {content.formInfo && content.formInfo.type === 'TSX' ? (
               <ReactFormRenderer
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/__mocks__/FormDisplayer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/__mocks__/FormDisplayer.tsx
index 6d4719044f..94b707de7e 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/__mocks__/FormDisplayer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/__mocks__/FormDisplayer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const FormDisplayer = () => {
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/InternalDisplayerApi.ts b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/InternalDisplayerApi.ts
index 3c9d9266da..6829d03215 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/InternalDisplayerApi.ts
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/InternalDisplayerApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormSubmitContext, FormSubmitResponse } from '../../../../api';
 
 declare global {
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/index.ts b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/index.ts
index 4fcc635e48..5fa17f67fa 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/index.ts
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/apis/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './InternalDisplayerApi';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/tests/FormDisplayer.test.tsx b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/tests/FormDisplayer.test.tsx
index cc766eac49..36aa79684a 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/tests/FormDisplayer.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormDisplayer/tests/FormDisplayer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import FormDisplayer from '../FormDisplayer';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/FormErrorsWrapper.tsx b/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/FormErrorsWrapper.tsx
index 54e8e84a30..95f2d9f5ff 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/FormErrorsWrapper.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/FormErrorsWrapper.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/__mocks__/FormErrorsWrapper.tsx b/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/__mocks__/FormErrorsWrapper.tsx
index 27e42364d4..f7e196342f 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/__mocks__/FormErrorsWrapper.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/__mocks__/FormErrorsWrapper.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const FormErrorsWrapper = () => {
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/tests/FormErrorsWrapper.test.tsx b/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/tests/FormErrorsWrapper.test.tsx
index 53263c04f9..9318d235ef 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/tests/FormErrorsWrapper.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/FormErrorsWrapper/tests/FormErrorsWrapper.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/HtmlFormRenderer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/HtmlFormRenderer.tsx
index 2c1fee0282..abec8075c5 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/HtmlFormRenderer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/HtmlFormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import InnerHTML from 'dangerously-set-html-content';
 import { FormResources } from '../../../api';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/__mocks__/HtmlFormRenderer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/__mocks__/HtmlFormRenderer.tsx
index 026ecbeabe..24bf6194ce 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/__mocks__/HtmlFormRenderer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/__mocks__/HtmlFormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const HtmlFormRenderer = () => {
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/tests/HtmlFormRenderer.test.tsx b/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/tests/HtmlFormRenderer.test.tsx
index 7574bde8f6..2594d5573e 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/tests/HtmlFormRenderer.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/HtmlFormRenderer/tests/HtmlFormRenderer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import HtmlFormRenderer from '../HtmlFormRenderer';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/ReactFormRenderer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/ReactFormRenderer.tsx
index c0df013e68..c6bde0fbc4 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/ReactFormRenderer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/ReactFormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import uuidv4 from 'uuid';
 import * as Babel from '@babel/standalone';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/__mocks__/ReactFormRenderer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/__mocks__/ReactFormRenderer.tsx
index 7018a0cd4b..0db7c5df7e 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/__mocks__/ReactFormRenderer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/__mocks__/ReactFormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const ReactFormRenderer = () => {
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/tests/ReactFormRenderer.test.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/tests/ReactFormRenderer.test.tsx
index 1907a4bf2c..d75b06b367 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/tests/ReactFormRenderer.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ReactFormRenderer/tests/ReactFormRenderer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import ReactFormRenderer from '../ReactFormRenderer';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/ResourcesContainer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/ResourcesContainer.tsx
index d7710881a4..63505558be 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/ResourcesContainer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/ResourcesContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { ReactElement } from 'react';
 import { Helmet } from 'react-helmet';
 import { FormResources } from '../../../api';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/__mocks__/ResourcesContainer.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/__mocks__/ResourcesContainer.tsx
index 453a1f4205..d11a600953 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/__mocks__/ResourcesContainer.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/__mocks__/ResourcesContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const ResourcesContainer = () => {
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/tests/ResourcesContainer.test.tsx b/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/tests/ResourcesContainer.test.tsx
index 821b4301f8..1804d3acf1 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/tests/ResourcesContainer.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/components/ResourcesContainer/tests/ResourcesContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import { Helmet } from 'react-helmet';
diff --git a/ui-packages/packages/form-displayer/src/envelope/components/styles.css b/ui-packages/packages/form-displayer/src/envelope/components/styles.css
index e7de488e27..524b7e1dda 100644
--- a/ui-packages/packages/form-displayer/src/envelope/components/styles.css
+++ b/ui-packages/packages/form-displayer/src/envelope/components/styles.css
@@ -1,23 +1,25 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-form-displayer__ball-beats {
-    margin-top: 50% !important;
+  margin-top: 50% !important;
 }
 
 .kogito-form-displayer-error-wrapper__align-left {
-    text-align: left !important;
-}
\ No newline at end of file
+  text-align: left !important;
+}
diff --git a/ui-packages/packages/form-displayer/src/envelope/index.ts b/ui-packages/packages/form-displayer/src/envelope/index.ts
index 453c1b2acd..8db85edbd0 100644
--- a/ui-packages/packages/form-displayer/src/envelope/index.ts
+++ b/ui-packages/packages/form-displayer/src/envelope/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormDisplayerEnvelope';
 export * from './FormDisplayerEnvelopeApiImpl';
 export * from './FormDisplayerEnvelopeContext';
diff --git a/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeApiImpl.test.tsx b/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeApiImpl.test.tsx
index 8e220acfbf..a682c4f34f 100644
--- a/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeApiImpl.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedFormDisplayerEnvelopeViewApi
diff --git a/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeView.test.tsx b/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeView.test.tsx
index 3bd7845600..e36e4bc5c3 100644
--- a/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeView.test.tsx
+++ b/ui-packages/packages/form-displayer/src/envelope/tests/FormDisplayerEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/form-displayer/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/form-displayer/src/envelope/tests/mocks/Mocks.ts
index 3049e24abd..66cf08d926 100755
--- a/ui-packages/packages/form-displayer/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/form-displayer/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames,
diff --git a/ui-packages/packages/form-displayer/src/index.ts b/ui-packages/packages/form-displayer/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/form-displayer/src/index.ts
+++ b/ui-packages/packages/form-displayer/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/form-displayer/src/utils/index.ts b/ui-packages/packages/form-displayer/src/utils/index.ts
index d696faf527..54f7c1d21a 100644
--- a/ui-packages/packages/form-displayer/src/utils/index.ts
+++ b/ui-packages/packages/form-displayer/src/utils/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './utils';
diff --git a/ui-packages/packages/form-displayer/src/utils/utils.tsx b/ui-packages/packages/form-displayer/src/utils/utils.tsx
index 0d35da14ae..411cd8d3f2 100644
--- a/ui-packages/packages/form-displayer/src/utils/utils.tsx
+++ b/ui-packages/packages/form-displayer/src/utils/utils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export const sourceHandler = (source) => {
   const reactReg = /import React, {[^}]*}.*(?='react').*/gim;
   const patternflyReg = /import {[^}]*}.*(?='@patternfly\/react-core').*/gim;
diff --git a/ui-packages/packages/forms-list/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/forms-list/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/forms-list/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/forms-list/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/forms-list/config/Jest-config/fileMocks.js b/ui-packages/packages/forms-list/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/forms-list/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/forms-list/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/forms-list/config/Jest-config/global-setup.js b/ui-packages/packages/forms-list/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/forms-list/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/forms-list/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/forms-list/config/Jest-config/styleMocks.js b/ui-packages/packages/forms-list/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/forms-list/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/forms-list/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/forms-list/config/Jest-config/test-setup.js b/ui-packages/packages/forms-list/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/forms-list/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/forms-list/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/forms-list/config/Jest-config/test-shim.js b/ui-packages/packages/forms-list/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/forms-list/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/forms-list/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/forms-list/package.json b/ui-packages/packages/forms-list/package.json
index 8d3d11b442..32b08d593e 100755
--- a/ui-packages/packages/forms-list/package.json
+++ b/ui-packages/packages/forms-list/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
     "@patternfly/react-core": "^4.276.8",
diff --git a/ui-packages/packages/forms-list/src/api/FormsListApi.ts b/ui-packages/packages/forms-list/src/api/FormsListApi.ts
index 7ecaab8d5b..05c6fcc469 100644
--- a/ui-packages/packages/forms-list/src/api/FormsListApi.ts
+++ b/ui-packages/packages/forms-list/src/api/FormsListApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface FormsListApi {
   // forms list api
 }
diff --git a/ui-packages/packages/forms-list/src/api/FormsListChannelApi.ts b/ui-packages/packages/forms-list/src/api/FormsListChannelApi.ts
index a82d631042..c69152b9d7 100755
--- a/ui-packages/packages/forms-list/src/api/FormsListChannelApi.ts
+++ b/ui-packages/packages/forms-list/src/api/FormsListChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormFilter, FormInfo } from './FormsListEnvelopeApi';
 /**
  * Channel Api for Forms List
diff --git a/ui-packages/packages/forms-list/src/api/FormsListDriver.ts b/ui-packages/packages/forms-list/src/api/FormsListDriver.ts
index 7725661f9f..169d452a0a 100755
--- a/ui-packages/packages/forms-list/src/api/FormsListDriver.ts
+++ b/ui-packages/packages/forms-list/src/api/FormsListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormFilter, FormInfo } from './FormsListEnvelopeApi';
 
 /**
diff --git a/ui-packages/packages/forms-list/src/api/FormsListEnvelopeApi.ts b/ui-packages/packages/forms-list/src/api/FormsListEnvelopeApi.ts
index 86c446b876..337f6f2f12 100755
--- a/ui-packages/packages/forms-list/src/api/FormsListEnvelopeApi.ts
+++ b/ui-packages/packages/forms-list/src/api/FormsListEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * Envelope Api
  */
diff --git a/ui-packages/packages/forms-list/src/api/index.ts b/ui-packages/packages/forms-list/src/api/index.ts
index 3738feda41..28fce0b2f5 100644
--- a/ui-packages/packages/forms-list/src/api/index.ts
+++ b/ui-packages/packages/forms-list/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormsListApi';
 export * from './FormsListChannelApi';
 export * from './FormsListEnvelopeApi';
diff --git a/ui-packages/packages/forms-list/src/embedded/EmbeddedFormsList.tsx b/ui-packages/packages/forms-list/src/embedded/EmbeddedFormsList.tsx
index 87f9fb555d..c0ebd7a800 100644
--- a/ui-packages/packages/forms-list/src/embedded/EmbeddedFormsList.tsx
+++ b/ui-packages/packages/forms-list/src/embedded/EmbeddedFormsList.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
diff --git a/ui-packages/packages/forms-list/src/embedded/FormsListChannelApiImpl.ts b/ui-packages/packages/forms-list/src/embedded/FormsListChannelApiImpl.ts
index b6c856eb91..03010e43e9 100755
--- a/ui-packages/packages/forms-list/src/embedded/FormsListChannelApiImpl.ts
+++ b/ui-packages/packages/forms-list/src/embedded/FormsListChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   FormsListDriver,
   FormsListChannelApi,
diff --git a/ui-packages/packages/forms-list/src/embedded/__mocks__/EmbeddedFormsList.tsx b/ui-packages/packages/forms-list/src/embedded/__mocks__/EmbeddedFormsList.tsx
index ccf7b686ef..bd2e00cc9e 100644
--- a/ui-packages/packages/forms-list/src/embedded/__mocks__/EmbeddedFormsList.tsx
+++ b/ui-packages/packages/forms-list/src/embedded/__mocks__/EmbeddedFormsList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedEmbeddedFormsList = (): React.ReactElement => {
diff --git a/ui-packages/packages/forms-list/src/embedded/index.ts b/ui-packages/packages/forms-list/src/embedded/index.ts
index e4afe399e5..7c5acd9012 100644
--- a/ui-packages/packages/forms-list/src/embedded/index.ts
+++ b/ui-packages/packages/forms-list/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedFormsList';
diff --git a/ui-packages/packages/forms-list/src/embedded/tests/EmbeddedFormsList.test.tsx b/ui-packages/packages/forms-list/src/embedded/tests/EmbeddedFormsList.test.tsx
index d76c695e3f..38be5cbce7 100644
--- a/ui-packages/packages/forms-list/src/embedded/tests/EmbeddedFormsList.test.tsx
+++ b/ui-packages/packages/forms-list/src/embedded/tests/EmbeddedFormsList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedFormsList } from '../EmbeddedFormsList';
 import { MockedFormsListDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/forms-list/src/embedded/tests/FormsListChannelApiImpl.test.tsx b/ui-packages/packages/forms-list/src/embedded/tests/FormsListChannelApiImpl.test.tsx
index a079f3c39d..b62c174b22 100755
--- a/ui-packages/packages/forms-list/src/embedded/tests/FormsListChannelApiImpl.test.tsx
+++ b/ui-packages/packages/forms-list/src/embedded/tests/FormsListChannelApiImpl.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { FormInfo, FormsListDriver, FormType } from '../../api';
 import { FormsListChannelApiImpl } from '../FormsListChannelApiImpl';
diff --git a/ui-packages/packages/forms-list/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/forms-list/src/embedded/tests/utils/Mocks.ts
index 981454bd2b..d76b814bd0 100755
--- a/ui-packages/packages/forms-list/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/forms-list/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormsListDriver } from '../../../api';
 
 export const MockedFormsListDriver = jest.fn<FormsListDriver, []>(() => ({
diff --git a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelope.tsx b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelope.tsx
index 1eb59e9fba..2e3cd486a6 100755
--- a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelope.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeApiImpl.ts b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeApiImpl.ts
index f1a46ba6c8..0ece2f1cf1 100644
--- a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeApiImpl.ts
+++ b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { FormsListEnvelopeViewApi } from './FormsListEnvelopeView';
 import { Association, FormsListChannelApi, FormsListEnvelopeApi } from '../api';
diff --git a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeContext.ts b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeContext.ts
index ab327764da..c2c49ab7f5 100644
--- a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeContext.ts
+++ b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeView.tsx b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeView.tsx
index 670d568d4e..6c6cbddc89 100755
--- a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeView.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { FormsListChannelApi } from '../api';
diff --git a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeViewDriver.ts b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeViewDriver.ts
index b026ae9645..bfbac58a3c 100755
--- a/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeViewDriver.ts
+++ b/ui-packages/packages/forms-list/src/envelope/FormsListEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   FormFilter,
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormCard/FormCard.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormCard/FormCard.tsx
index 482c5623b6..d9c24a435c 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormCard/FormCard.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormCard/FormCard.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormCard/tests/FormCard.test.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormCard/tests/FormCard.test.tsx
index 0c56ae374d..692aa69428 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormCard/tests/FormCard.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormCard/tests/FormCard.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import {
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/FormsGallery.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/FormsGallery.tsx
index 8c0adedc14..21370eca50 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/FormsGallery.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/FormsGallery.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/__mocks__/FormsGallery.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/__mocks__/FormsGallery.tsx
index 2a15c4a8ae..9cece4b7a9 100644
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/__mocks__/FormsGallery.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/__mocks__/FormsGallery.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/tests/FormsGallery.test.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/tests/FormsGallery.test.tsx
index 96aa6d5edb..1a9a992785 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/tests/FormsGallery.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsGallery/tests/FormsGallery.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import FormsGallery from '../FormsGallery';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsList/FormsList.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsList/FormsList.tsx
index 085e83bce6..7d585b3cec 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsList/FormsList.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsList/FormsList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import {
   OUIAProps,
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsList/__mocks__/FormsList.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsList/__mocks__/FormsList.tsx
index aa608e7515..100b57b028 100644
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsList/__mocks__/FormsList.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsList/__mocks__/FormsList.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsList/tests/FormsList.test.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsList/tests/FormsList.test.tsx
index a73a6b0cbe..089bdbfcba 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsList/tests/FormsList.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsList/tests/FormsList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import FormsList from '../FormsList';
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/FormsListToolbar.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/FormsListToolbar.tsx
index e172c8c331..ea2ec0b0b6 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/FormsListToolbar.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/FormsListToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   Button,
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/__mocks__/FormsListToolbar.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/__mocks__/FormsListToolbar.tsx
index 67ba2010c1..fa28f9cdf8 100644
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/__mocks__/FormsListToolbar.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/__mocks__/FormsListToolbar.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/tests/FormsListToolbar.test.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/tests/FormsListToolbar.test.tsx
index 129d484918..f24742d288 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/tests/FormsListToolbar.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsListToolbar/tests/FormsListToolbar.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import FormsListToolbar from '../FormsListToolbar';
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/FormsListUtils.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/FormsListUtils.tsx
index 313c65d4ce..06e64bdde1 100644
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/FormsListUtils.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/FormsListUtils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import Moment from 'react-moment';
 import { DataTableColumn } from '@kogito-apps/components-common/dist/components/DataTable';
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/tests/FormsListUtils.test.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/tests/FormsListUtils.test.tsx
index a991dbe1bf..228e3e8c41 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/tests/FormsListUtils.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsListUtils/tests/FormsListUtils.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormType } from '../../../../api/FormsListEnvelopeApi';
 import {
   getDateColumn,
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsTable/FormsTable.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsTable/FormsTable.tsx
index ea4821db62..948823819c 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsTable/FormsTable.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsTable/FormsTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import {
   DataTable,
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsTable/__mocks__/FormsTable.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsTable/__mocks__/FormsTable.tsx
index 86aac4ebfd..4ce08d195b 100644
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsTable/__mocks__/FormsTable.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsTable/__mocks__/FormsTable.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/forms-list/src/envelope/components/FormsTable/tests/FormsTable.test.tsx b/ui-packages/packages/forms-list/src/envelope/components/FormsTable/tests/FormsTable.test.tsx
index 999e02e317..43d5a4b6d9 100755
--- a/ui-packages/packages/forms-list/src/envelope/components/FormsTable/tests/FormsTable.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/components/FormsTable/tests/FormsTable.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import FormsTable from '../FormsTable';
diff --git a/ui-packages/packages/forms-list/src/envelope/index.ts b/ui-packages/packages/forms-list/src/envelope/index.ts
index 3f0162ca76..b4551c325d 100644
--- a/ui-packages/packages/forms-list/src/envelope/index.ts
+++ b/ui-packages/packages/forms-list/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './FormsListEnvelope';
diff --git a/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeApiImpl.test.tsx b/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeApiImpl.test.tsx
index a4724900f7..c2edfdad86 100644
--- a/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeApiImpl.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedFormsListEnvelopeViewApi
diff --git a/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeView.test.tsx b/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeView.test.tsx
index 958ebe11b0..2e2afb90f0 100644
--- a/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeView.test.tsx
+++ b/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeViewDriver.test.ts b/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeViewDriver.test.ts
index 01c15ab614..7422b2a124 100755
--- a/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/forms-list/src/envelope/tests/FormsListEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/forms-list/src/envelope/tests/mocks/MockedFormsListDriver.ts b/ui-packages/packages/forms-list/src/envelope/tests/mocks/MockedFormsListDriver.ts
index 88c2e59f29..beaea556a9 100755
--- a/ui-packages/packages/forms-list/src/envelope/tests/mocks/MockedFormsListDriver.ts
+++ b/ui-packages/packages/forms-list/src/envelope/tests/mocks/MockedFormsListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormFilter, FormInfo, FormsListDriver, FormType } from '../../../api';
 
 export const formList: FormInfo[] = [
diff --git a/ui-packages/packages/forms-list/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/forms-list/src/envelope/tests/mocks/Mocks.ts
index bfad165562..5239d492c5 100755
--- a/ui-packages/packages/forms-list/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/forms-list/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/forms-list/src/index.ts b/ui-packages/packages/forms-list/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/forms-list/src/index.ts
+++ b/ui-packages/packages/forms-list/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/jobs-management/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/jobs-management/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/jobs-management/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/jobs-management/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/jobs-management/config/Jest-config/fileMocks.js b/ui-packages/packages/jobs-management/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/jobs-management/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/jobs-management/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/jobs-management/config/Jest-config/global-setup.js b/ui-packages/packages/jobs-management/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/jobs-management/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/jobs-management/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/jobs-management/config/Jest-config/styleMocks.js b/ui-packages/packages/jobs-management/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/jobs-management/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/jobs-management/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/jobs-management/config/Jest-config/test-setup.js b/ui-packages/packages/jobs-management/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/jobs-management/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/jobs-management/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/jobs-management/config/Jest-config/test-shim.js b/ui-packages/packages/jobs-management/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/jobs-management/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/jobs-management/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/jobs-management/package.json b/ui-packages/packages/jobs-management/package.json
index 88c414f5b8..2050fcf7d1 100644
--- a/ui-packages/packages/jobs-management/package.json
+++ b/ui-packages/packages/jobs-management/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/management-console-shared": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
diff --git a/ui-packages/packages/jobs-management/src/api/JobsManagementApi.ts b/ui-packages/packages/jobs-management/src/api/JobsManagementApi.ts
index 245116ffa7..03efbab91a 100644
--- a/ui-packages/packages/jobs-management/src/api/JobsManagementApi.ts
+++ b/ui-packages/packages/jobs-management/src/api/JobsManagementApi.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 // eslint-disable-next-line  @typescript-eslint/no-empty-interface
 export interface JobsManagementApi {}
diff --git a/ui-packages/packages/jobs-management/src/api/JobsManagementChannelApi.ts b/ui-packages/packages/jobs-management/src/api/JobsManagementChannelApi.ts
index 730d93834c..747e630523 100644
--- a/ui-packages/packages/jobs-management/src/api/JobsManagementChannelApi.ts
+++ b/ui-packages/packages/jobs-management/src/api/JobsManagementChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Job,
   JobStatus,
diff --git a/ui-packages/packages/jobs-management/src/api/JobsManagementDriver.ts b/ui-packages/packages/jobs-management/src/api/JobsManagementDriver.ts
index 2cd08fcaa2..d0df6c222a 100644
--- a/ui-packages/packages/jobs-management/src/api/JobsManagementDriver.ts
+++ b/ui-packages/packages/jobs-management/src/api/JobsManagementDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Job,
   JobStatus,
diff --git a/ui-packages/packages/jobs-management/src/api/JobsManagementEnvelopeApi.ts b/ui-packages/packages/jobs-management/src/api/JobsManagementEnvelopeApi.ts
index 686f6ee7ef..c2c83ddf8b 100644
--- a/ui-packages/packages/jobs-management/src/api/JobsManagementEnvelopeApi.ts
+++ b/ui-packages/packages/jobs-management/src/api/JobsManagementEnvelopeApi.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 export interface JobsManagementEnvelopeApi {
   jobsManagement__init(association: Association);
diff --git a/ui-packages/packages/jobs-management/src/api/index.ts b/ui-packages/packages/jobs-management/src/api/index.ts
index d3c1ac24e5..63edc6fe8a 100644
--- a/ui-packages/packages/jobs-management/src/api/index.ts
+++ b/ui-packages/packages/jobs-management/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './JobsManagementApi';
 export * from './JobsManagementEnvelopeApi';
 export * from './JobsManagementChannelApi';
diff --git a/ui-packages/packages/jobs-management/src/api/mocks/MockedJobsManagementDriver.ts b/ui-packages/packages/jobs-management/src/api/mocks/MockedJobsManagementDriver.ts
index 6f24064eba..927a8c91ff 100644
--- a/ui-packages/packages/jobs-management/src/api/mocks/MockedJobsManagementDriver.ts
+++ b/ui-packages/packages/jobs-management/src/api/mocks/MockedJobsManagementDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { JobsManagementDriver } from '../JobsManagementDriver';
 
 export const MockedJobsManagementDriver = jest.fn<JobsManagementDriver, []>(
diff --git a/ui-packages/packages/jobs-management/src/embedded/EmbeddedJobsManagement.tsx b/ui-packages/packages/jobs-management/src/embedded/EmbeddedJobsManagement.tsx
index 54c5ffcf5b..eeebe70b61 100644
--- a/ui-packages/packages/jobs-management/src/embedded/EmbeddedJobsManagement.tsx
+++ b/ui-packages/packages/jobs-management/src/embedded/EmbeddedJobsManagement.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
diff --git a/ui-packages/packages/jobs-management/src/embedded/JobsManagementChannelApiImpl.ts b/ui-packages/packages/jobs-management/src/embedded/JobsManagementChannelApiImpl.ts
index e947c650cc..aa91906f70 100644
--- a/ui-packages/packages/jobs-management/src/embedded/JobsManagementChannelApiImpl.ts
+++ b/ui-packages/packages/jobs-management/src/embedded/JobsManagementChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { JobsManagementChannelApi, JobsManagementDriver } from '../api';
 import {
   Job,
diff --git a/ui-packages/packages/jobs-management/src/embedded/index.ts b/ui-packages/packages/jobs-management/src/embedded/index.ts
index 0e6ca30c45..754c54d588 100644
--- a/ui-packages/packages/jobs-management/src/embedded/index.ts
+++ b/ui-packages/packages/jobs-management/src/embedded/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedJobsManagement';
 export * from './JobsManagementChannelApiImpl';
diff --git a/ui-packages/packages/jobs-management/src/embedded/tests/EmbeddedJobsManagement.test.tsx b/ui-packages/packages/jobs-management/src/embedded/tests/EmbeddedJobsManagement.test.tsx
index 16e69813f6..1696d31bca 100644
--- a/ui-packages/packages/jobs-management/src/embedded/tests/EmbeddedJobsManagement.test.tsx
+++ b/ui-packages/packages/jobs-management/src/embedded/tests/EmbeddedJobsManagement.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedJobsManagement } from '../EmbeddedJobsManagement';
 import { MockedJobsManagementDriver } from './mocks/Mocks';
diff --git a/ui-packages/packages/jobs-management/src/embedded/tests/JobsManagementChannelApiImpl.test.ts b/ui-packages/packages/jobs-management/src/embedded/tests/JobsManagementChannelApiImpl.test.ts
index 982ed49667..c69eae0388 100644
--- a/ui-packages/packages/jobs-management/src/embedded/tests/JobsManagementChannelApiImpl.test.ts
+++ b/ui-packages/packages/jobs-management/src/embedded/tests/JobsManagementChannelApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Job,
   JobStatus
diff --git a/ui-packages/packages/jobs-management/src/embedded/tests/mocks/Mocks.ts b/ui-packages/packages/jobs-management/src/embedded/tests/mocks/Mocks.ts
index f1d43849f8..bb426aa88f 100644
--- a/ui-packages/packages/jobs-management/src/embedded/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/jobs-management/src/embedded/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { JobsManagementDriver } from '../../../api';
 
 export const MockedJobsManagementDriver = jest.fn<JobsManagementDriver, []>(
diff --git a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelope.tsx b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelope.tsx
index 93ecaeeac4..a5559e9441 100644
--- a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelope.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeApiImpl.ts b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeApiImpl.ts
index b5f077ddbd..620ba146c3 100644
--- a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeApiImpl.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { JobsManagementEnvelopeViewApi } from './JobsManagementEnvelopeView';
 import {
diff --git a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeContext.ts b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeContext.ts
index a3adf6d5d9..19ddbe4b10 100644
--- a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeContext.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  * Since the Jobs Management View is very simple, it's empty.
diff --git a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeView.tsx b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeView.tsx
index 435b6156da..49f30e2485 100644
--- a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeView.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeViewDriver.ts b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeViewDriver.ts
index 17ac053982..4b2615ff14 100644
--- a/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeViewDriver.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/JobsManagementEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   Job,
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/JobsManagement.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/JobsManagement.tsx
index e5d68003f2..9be977c4fd 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/JobsManagement.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/JobsManagement.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
 import { CardTitle } from '@patternfly/react-core/dist/js/components/Card';
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/JobsManagement.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/JobsManagement.tsx
index 907a927460..8ff407439c 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/JobsManagement.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/JobsManagement.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedJobsManagement = (): React.ReactElement => {
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/mockData.ts b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/mockData.ts
index e64afc0258..92ea79b30a 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/mockData.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/__mocks__/mockData.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { JobStatus } from '@kogito-apps/management-console-shared/dist/types';
 
 export const Jobs = [
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/tests/JobsManagement.test.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/tests/JobsManagement.test.tsx
index c9435b075d..11e8790238 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/tests/JobsManagement.test.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagement/tests/JobsManagement.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import { MockedJobsManagementDriver } from '../../../../api/mocks/MockedJobsManagementDriver';
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/JobsManagementTable.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/JobsManagementTable.tsx
index 172076e0b9..d3de9830c4 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/JobsManagementTable.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/JobsManagementTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState, useEffect } from 'react';
 import {
   Table,
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/__mocks__/JobsManagementTable.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/__mocks__/JobsManagementTable.tsx
index 4094522dbb..9a13e45f94 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/__mocks__/JobsManagementTable.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/__mocks__/JobsManagementTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedJobsManagementTable = (): React.ReactElement => {
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/tests/JobsManagementTable.test.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/tests/JobsManagementTable.test.tsx
index e734c6c419..6b731e1741 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/tests/JobsManagementTable.test.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementTable/tests/JobsManagementTable.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import axios from 'axios';
 import JobsManagementTable from '../JobsManagementTable';
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/JobsManagementToolbar.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/JobsManagementToolbar.tsx
index f922d37224..0d8f50502b 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/JobsManagementToolbar.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/JobsManagementToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState, useEffect } from 'react';
 import {
   DropdownItem,
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/__mocks__/JobsManagementToolbar.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/__mocks__/JobsManagementToolbar.tsx
index 11345d5013..64cd016cdb 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/__mocks__/JobsManagementToolbar.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/__mocks__/JobsManagementToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedJobsManagementToolbar = (): React.ReactElement => {
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/tests/JobsManagementToolbar.test.tsx b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/tests/JobsManagementToolbar.test.tsx
index db1ce012f0..0851ae1115 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/tests/JobsManagementToolbar.test.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/components/JobsManagementToolbar/tests/JobsManagementToolbar.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/jobs-management/src/envelope/components/styles.css b/ui-packages/packages/jobs-management/src/envelope/components/styles.css
index 39e2399b62..db9f55d87c 100644
--- a/ui-packages/packages/jobs-management/src/envelope/components/styles.css
+++ b/ui-packages/packages/jobs-management/src/envelope/components/styles.css
@@ -1,57 +1,58 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
- .kogito-jobs-management__state-dropdown-list
- .pf-c-data-toolbar__item:first-child
- .pf-c-chip__text::first-letter {
- text-transform: uppercase;
+.kogito-jobs-management__state-dropdown-list
+  .pf-c-data-toolbar__item:first-child
+  .pf-c-chip__text::first-letter {
+  text-transform: uppercase;
 }
 .kogito-jobs-management__state-dropdown-list
- .pf-c-data-toolbar__item:first-child
- .pf-c-chip__text {
- text-transform: lowercase;
+  .pf-c-data-toolbar__item:first-child
+  .pf-c-chip__text {
+  text-transform: lowercase;
 }
 
-.kogito-jobs-management__state-dropdown-list
- .pf-c-check__label::first-letter {
- text-transform: uppercase;
+.kogito-jobs-management__state-dropdown-list .pf-c-check__label::first-letter {
+  text-transform: uppercase;
 }
 
 .kogito-jobs-management__state-dropdown-list .pf-c-check__label {
- text-transform: lowercase;
+  text-transform: lowercase;
 }
 
 .kogito-jobs-management__table .pf-c-table__sort .pf-c-table__button {
-    text-align: center;
-    display: inline-block;
-    margin-left: 0;
+  text-align: center;
+  display: inline-block;
+  margin-left: 0;
 }
 
 .pf-c-chip-group .pf-c-chip__text {
-    font-weight: 400 !important;
+  font-weight: 400 !important;
 }
 
 .kogito-jobs-management__table td:not(:first-of-type) {
-    min-width: 10em;
+  min-width: 10em;
 }
 
 .kogito-jobs-management__table .pf-c-table__action {
-    text-align: right;
+  text-align: right;
 }
 
 .kogito-jobs-management__emptyState {
-    margin-top: 100px;
-}
\ No newline at end of file
+  margin-top: 100px;
+}
diff --git a/ui-packages/packages/jobs-management/src/envelope/index.ts b/ui-packages/packages/jobs-management/src/envelope/index.ts
index 82cacc3061..1fee95856f 100644
--- a/ui-packages/packages/jobs-management/src/envelope/index.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './JobsManagementEnvelope';
diff --git a/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeApiImpl.test.ts b/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeApiImpl.test.ts
index 2b3efe058c..09804f9bcf 100644
--- a/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedJobsManagementEnvelopeViewApi
diff --git a/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeView.test.tsx b/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeView.test.tsx
index 935a4585a3..f51502ded2 100644
--- a/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeView.test.tsx
+++ b/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeViewDriver.test.ts b/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeViewDriver.test.ts
index 2acea75188..8bb993d7fa 100644
--- a/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/tests/JobsManagementEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/jobs-management/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/jobs-management/src/envelope/tests/mocks/Mocks.ts
index 981ddb1df8..ece7b77173 100644
--- a/ui-packages/packages/jobs-management/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/jobs-management/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   NotificationPropertyNames,
diff --git a/ui-packages/packages/jobs-management/src/index.ts b/ui-packages/packages/jobs-management/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/jobs-management/src/index.ts
+++ b/ui-packages/packages/jobs-management/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/jobs-management/src/utils/tests/utils.test.tsx b/ui-packages/packages/jobs-management/src/utils/tests/utils.test.tsx
index ae168be3f9..4a0c0b2d57 100644
--- a/ui-packages/packages/jobs-management/src/utils/tests/utils.test.tsx
+++ b/ui-packages/packages/jobs-management/src/utils/tests/utils.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { JobStatus } from '@kogito-apps/management-console-shared/dist/types';
 import { JobsIconCreator } from '../utils';
 const children = 'children';
diff --git a/ui-packages/packages/jobs-management/src/utils/utils.tsx b/ui-packages/packages/jobs-management/src/utils/utils.tsx
index 877c34dca0..d2d899402f 100644
--- a/ui-packages/packages/jobs-management/src/utils/utils.tsx
+++ b/ui-packages/packages/jobs-management/src/utils/utils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { JobStatus } from '@kogito-apps/management-console-shared/dist/types';
 import { UndoIcon } from '@patternfly/react-icons/dist/js/icons/undo-icon';
diff --git a/ui-packages/packages/management-console-shared/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/management-console-shared/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/management-console-shared/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/management-console-shared/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/management-console-shared/config/Jest-config/fileMocks.js b/ui-packages/packages/management-console-shared/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/management-console-shared/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/management-console-shared/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/management-console-shared/config/Jest-config/global-setup.js b/ui-packages/packages/management-console-shared/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/management-console-shared/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/management-console-shared/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/management-console-shared/config/Jest-config/styleMocks.js b/ui-packages/packages/management-console-shared/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/management-console-shared/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/management-console-shared/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/management-console-shared/config/Jest-config/test-setup.js b/ui-packages/packages/management-console-shared/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/management-console-shared/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/management-console-shared/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/management-console-shared/config/Jest-config/test-shim.js b/ui-packages/packages/management-console-shared/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/management-console-shared/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/management-console-shared/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/management-console-shared/package.json b/ui-packages/packages/management-console-shared/package.json
index fafa9ded98..446141a0fa 100755
--- a/ui-packages/packages/management-console-shared/package.json
+++ b/ui-packages/packages/management-console-shared/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.24.0",
-    "@kie-tools-core/envelope-bus": "0.24.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
diff --git a/ui-packages/packages/management-console-shared/src/components/BulkList/BulkList.tsx b/ui-packages/packages/management-console-shared/src/components/BulkList/BulkList.tsx
index 01a2789849..867932e815 100644
--- a/ui-packages/packages/management-console-shared/src/components/BulkList/BulkList.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/BulkList/BulkList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   TextContent,
diff --git a/ui-packages/packages/management-console-shared/src/components/BulkList/__mocks__/BulkList.tsx b/ui-packages/packages/management-console-shared/src/components/BulkList/__mocks__/BulkList.tsx
index f6a3895e41..7dada75467 100644
--- a/ui-packages/packages/management-console-shared/src/components/BulkList/__mocks__/BulkList.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/BulkList/__mocks__/BulkList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedBulkList = (): React.ReactElement => {
diff --git a/ui-packages/packages/management-console-shared/src/components/BulkList/index.ts b/ui-packages/packages/management-console-shared/src/components/BulkList/index.ts
index bc2fb3b7ba..d3de0c529c 100644
--- a/ui-packages/packages/management-console-shared/src/components/BulkList/index.ts
+++ b/ui-packages/packages/management-console-shared/src/components/BulkList/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './BulkList';
diff --git a/ui-packages/packages/management-console-shared/src/components/BulkList/tests/BulkList.test.tsx b/ui-packages/packages/management-console-shared/src/components/BulkList/tests/BulkList.test.tsx
index 3f25195eef..ce57a6dcd4 100644
--- a/ui-packages/packages/management-console-shared/src/components/BulkList/tests/BulkList.test.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/BulkList/tests/BulkList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { shallow } from 'enzyme';
 import { BulkList } from '../BulkList';
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/JobsCancelModal.tsx b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/JobsCancelModal.tsx
index 79854b354f..0d7eb99b53 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/JobsCancelModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/JobsCancelModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   TextContent,
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/__mocks__/JobsCancelModal.tsx b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/__mocks__/JobsCancelModal.tsx
index 1fb90d1520..5773d5ac4a 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/__mocks__/JobsCancelModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/__mocks__/JobsCancelModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const JobsCancelModal = () => {
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/index.ts b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/index.ts
index 880a47ff71..91209b5e1d 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/index.ts
+++ b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './JobsCancelModal';
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/tests/JobsCancelModal.test.tsx b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/tests/JobsCancelModal.test.tsx
index 91720d28df..707003aac1 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/tests/JobsCancelModal.test.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsCancelModal/tests/JobsCancelModal.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { setTitle } from '../../../utils/Utils';
 import { JobsCancelModal } from '../JobsCancelModal';
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/JobsDetailsModal.tsx b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/JobsDetailsModal.tsx
index 792b0c6efa..0351721fac 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/JobsDetailsModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/JobsDetailsModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { Job } from '../../types';
 import {
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/JobsDetailsModal.tsx b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/JobsDetailsModal.tsx
index cfefe041a6..68052eb88d 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/JobsDetailsModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/JobsDetailsModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedJobsDetailsModal = (): React.ReactElement => {
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/tabbable.js b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/tabbable.js
index d86d325edc..02d3358598 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/tabbable.js
+++ b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/__mocks__/tabbable.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const lib = jest.requireActual('tabbable');
 
 const tabbable = {
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/index.ts b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/index.ts
index a46f4124a5..5907e08415 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/index.ts
+++ b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './JobsDetailsModal';
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/tests/JobsDetailsModal.test.tsx b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/tests/JobsDetailsModal.test.tsx
index 991f3fb1ee..e43b508615 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/tests/JobsDetailsModal.test.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsDetailsModal/tests/JobsDetailsModal.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { JobsDetailsModal } from '../JobsDetailsModal';
 import { JobStatus } from '../../../types';
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/JobsRescheduleModal.tsx b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/JobsRescheduleModal.tsx
index a685d8b55b..56923d3c57 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/JobsRescheduleModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/JobsRescheduleModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   Modal,
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/__mocks__/JobsRescheduleModal.tsx b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/__mocks__/JobsRescheduleModal.tsx
index 69bc0bd396..ec34f60595 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/__mocks__/JobsRescheduleModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/__mocks__/JobsRescheduleModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const JobsRescheduleModal = () => {
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/index.ts b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/index.ts
index 1d88dc2d5b..727bd557ee 100644
--- a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/index.ts
+++ b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './JobsRescheduleModal';
diff --git a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/tests/JobsRescheduleModal.test.tsx b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/tests/JobsRescheduleModal.test.tsx
index eb92b7407d..c5701f542f 100755
--- a/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/tests/JobsRescheduleModal.test.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/JobsRescheduleModal/tests/JobsRescheduleModal.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { JobsRescheduleModal } from '../JobsRescheduleModal';
 import { JobStatus } from '../../../types';
diff --git a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/ProcessInfoModal.tsx b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/ProcessInfoModal.tsx
index f7c4cdf25c..e4d1519cde 100644
--- a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/ProcessInfoModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/ProcessInfoModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   TextContent,
diff --git a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/__mocks__/ProcessInfoModal.tsx b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/__mocks__/ProcessInfoModal.tsx
index b464266dbc..e63eacf8a2 100644
--- a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/__mocks__/ProcessInfoModal.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/__mocks__/ProcessInfoModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessInfoModal = (): React.ReactElement => {
diff --git a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/index.ts b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/index.ts
index d5035ec13d..5b7eef9e45 100644
--- a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/index.ts
+++ b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessInfoModal';
diff --git a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/tests/ProcessInfoModal.test.tsx b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/tests/ProcessInfoModal.test.tsx
index c2c89fb462..2e08e96641 100644
--- a/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/tests/ProcessInfoModal.test.tsx
+++ b/ui-packages/packages/management-console-shared/src/components/ProcessInfoModal/tests/ProcessInfoModal.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { shallow } from 'enzyme';
 import { ProcessInfoModal } from '../ProcessInfoModal';
diff --git a/ui-packages/packages/management-console-shared/src/components/styles.css b/ui-packages/packages/management-console-shared/src/components/styles.css
index 8dad021b7f..2aa992646d 100644
--- a/ui-packages/packages/management-console-shared/src/components/styles.css
+++ b/ui-packages/packages/management-console-shared/src/components/styles.css
@@ -1,34 +1,36 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-management-console-shared--jobsModal__detailsModal {
-    padding: 30px;
+  padding: 30px;
 }
 
 .kogito-management-console-shared--jobsModal__text {
-    white-space: nowrap;
+  white-space: nowrap;
 }
 
 .kogito-management-console-shared--jobsModal__ModalBody {
-    height: 400px;
+  height: 400px;
 }
 .react-calendar {
-    width: 300px !important;
+  width: 300px !important;
 }
 
 .kogito-management-console-shared--jobsModal__TimeNow {
-    margin-top: 10px; 
+  margin-top: 10px;
 }
diff --git a/ui-packages/packages/management-console-shared/src/index.ts b/ui-packages/packages/management-console-shared/src/index.ts
index 23be34cca4..4fc48b5db4 100644
--- a/ui-packages/packages/management-console-shared/src/index.ts
+++ b/ui-packages/packages/management-console-shared/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './components/JobsCancelModal/JobsCancelModal';
 export * from './components/JobsDetailsModal/JobsDetailsModal';
 export * from './components/JobsRescheduleModal/JobsRescheduleModal';
diff --git a/ui-packages/packages/management-console-shared/src/types/index.ts b/ui-packages/packages/management-console-shared/src/types/index.ts
index 580ec85cc7..9d53b92978 100644
--- a/ui-packages/packages/management-console-shared/src/types/index.ts
+++ b/ui-packages/packages/management-console-shared/src/types/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './types';
diff --git a/ui-packages/packages/management-console-shared/src/types/types.ts b/ui-packages/packages/management-console-shared/src/types/types.ts
index f2019666ed..3fff20b7d7 100644
--- a/ui-packages/packages/management-console-shared/src/types/types.ts
+++ b/ui-packages/packages/management-console-shared/src/types/types.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export enum JobStatus {
   Error = 'ERROR',
   Executed = 'EXECUTED',
diff --git a/ui-packages/packages/management-console-shared/src/utils/Utils.tsx b/ui-packages/packages/management-console-shared/src/utils/Utils.tsx
index 21b3d8f228..8f19f94ad3 100644
--- a/ui-packages/packages/management-console-shared/src/utils/Utils.tsx
+++ b/ui-packages/packages/management-console-shared/src/utils/Utils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { BanIcon } from '@patternfly/react-icons/dist/js/icons/ban-icon';
 import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
diff --git a/ui-packages/packages/management-console-shared/src/utils/tests/Utils.test.tsx b/ui-packages/packages/management-console-shared/src/utils/tests/Utils.test.tsx
index 8a28e85732..acb6444c09 100644
--- a/ui-packages/packages/management-console-shared/src/utils/tests/Utils.test.tsx
+++ b/ui-packages/packages/management-console-shared/src/utils/tests/Utils.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessInstance, ProcessInstanceState } from '../../types';
 import {
   constructObject,
diff --git a/ui-packages/packages/management-console-webapp/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/management-console-webapp/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/management-console-webapp/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/management-console-webapp/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/management-console-webapp/config/Jest-config/fileMocks.js b/ui-packages/packages/management-console-webapp/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/management-console-webapp/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/management-console-webapp/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/management-console-webapp/config/Jest-config/global-setup.js b/ui-packages/packages/management-console-webapp/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/management-console-webapp/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/management-console-webapp/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/management-console-webapp/config/Jest-config/styleMocks.js b/ui-packages/packages/management-console-webapp/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/management-console-webapp/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/management-console-webapp/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/management-console-webapp/config/Jest-config/test-setup.js b/ui-packages/packages/management-console-webapp/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/management-console-webapp/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/management-console-webapp/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/management-console-webapp/config/Jest-config/test-shim.js b/ui-packages/packages/management-console-webapp/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/management-console-webapp/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/management-console-webapp/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/management-console-webapp/config/declare.d.ts b/ui-packages/packages/management-console-webapp/config/declare.d.ts
index 0004da08d4..3cfbfeeca3 100644
--- a/ui-packages/packages/management-console-webapp/config/declare.d.ts
+++ b/ui-packages/packages/management-console-webapp/config/declare.d.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 declare module '*.svg' {
   const content: string;
   export default content;
diff --git a/ui-packages/packages/management-console-webapp/cypress.config.ts b/ui-packages/packages/management-console-webapp/cypress.config.ts
index c43f12c05c..777285c15c 100644
--- a/ui-packages/packages/management-console-webapp/cypress.config.ts
+++ b/ui-packages/packages/management-console-webapp/cypress.config.ts
@@ -1,8 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
   viewportWidth: 1920,
   viewportHeight: 1080,
+  reporter: 'junit',
+  reporterOptions: {
+    mochaFile: 'cypress-results/TEST-it-[hash]/junit.xml'
+  },
 
   e2e: {
     // We've imported your old cypress plugins here.
diff --git a/ui-packages/packages/management-console-webapp/cypress/e2e/processes/page-initial-load.cy.ts b/ui-packages/packages/management-console-webapp/cypress/e2e/processes/page-initial-load.cy.ts
index 2d26b1d1f7..3b3d1980ef 100644
--- a/ui-packages/packages/management-console-webapp/cypress/e2e/processes/page-initial-load.cy.ts
+++ b/ui-packages/packages/management-console-webapp/cypress/e2e/processes/page-initial-load.cy.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 describe('Process List Page test', () => {
   beforeEach('visit page', () => {
     cy.visit('http://localhost:9000/ProcessInstances');
diff --git a/ui-packages/packages/management-console-webapp/cypress/plugins/index.ts b/ui-packages/packages/management-console-webapp/cypress/plugins/index.ts
index d882cda194..935fba92ef 100644
--- a/ui-packages/packages/management-console-webapp/cypress/plugins/index.ts
+++ b/ui-packages/packages/management-console-webapp/cypress/plugins/index.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /// <reference types="cypress" />
 // ***********************************************************
 // This example plugins/index.js can be used to load plugins
diff --git a/ui-packages/packages/management-console-webapp/cypress/support/commands.ts b/ui-packages/packages/management-console-webapp/cypress/support/commands.ts
index ca4d256f3e..615773ee8b 100644
--- a/ui-packages/packages/management-console-webapp/cypress/support/commands.ts
+++ b/ui-packages/packages/management-console-webapp/cypress/support/commands.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 // ***********************************************
 // This example commands.js shows you how to
 // create various custom commands and overwrite
diff --git a/ui-packages/packages/management-console-webapp/cypress/support/component-index.html b/ui-packages/packages/management-console-webapp/cypress/support/component-index.html
index e39ba42969..1bd70fd549 100644
--- a/ui-packages/packages/management-console-webapp/cypress/support/component-index.html
+++ b/ui-packages/packages/management-console-webapp/cypress/support/component-index.html
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html>
   <head>
diff --git a/ui-packages/packages/management-console-webapp/cypress/support/component.ts b/ui-packages/packages/management-console-webapp/cypress/support/component.ts
index 06b32ef004..ad854da737 100644
--- a/ui-packages/packages/management-console-webapp/cypress/support/component.ts
+++ b/ui-packages/packages/management-console-webapp/cypress/support/component.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 // ***********************************************************
 // This example support/component.ts is processed and
 // loaded automatically before your test files.
diff --git a/ui-packages/packages/management-console-webapp/cypress/support/e2e.ts b/ui-packages/packages/management-console-webapp/cypress/support/e2e.ts
index 350eeb84b2..093a776143 100644
--- a/ui-packages/packages/management-console-webapp/cypress/support/e2e.ts
+++ b/ui-packages/packages/management-console-webapp/cypress/support/e2e.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 // ***********************************************************
 // This example support/index.js is processed and
 // loaded automatically before your test files.
diff --git a/ui-packages/packages/management-console-webapp/server/MockData/controllers.js b/ui-packages/packages/management-console-webapp/server/MockData/controllers.js
index 28e2a32516..1754cb6d7f 100644
--- a/ui-packages/packages/management-console-webapp/server/MockData/controllers.js
+++ b/ui-packages/packages/management-console-webapp/server/MockData/controllers.js
@@ -1,26 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const restData = require('./rest');
 const graphData = require('./graphql');
 const path = require('path');
 
-const processSvg = ['8035b580-6ae4-4aa8-9ec0-e18e19809e0b','a1e139d5-4e77-48c9-84ae-34578e904e5a','8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop', '2d962eef-45b8-48a9-ad4e-9cde0ad6af88', 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e']
+const processSvg = [
+  '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+  'a1e139d5-4e77-48c9-84ae-34578e904e5a',
+  '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop',
+  '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+  'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e'
+];
 module.exports = controller = {
   showError: (req, res) => {
     console.log('called', req.params.processId, req.params.processInstanceId);
     const { process } = restData.management;
-    const processId = process.filter(data => {
+    const processId = process.filter((data) => {
       return data.processId === req.params.processId;
     });
-    const error = processId[0].instances.filter(err => {
+    const error = processId[0].instances.filter((err) => {
       return err.processInstanceId === req.params.processInstanceId;
     });
     res.send(error[0].error);
   },
   callRetrigger: (req, res) => {
     const { process } = restData.management;
-    const processId = process.filter(data => {
+    const processId = process.filter((data) => {
       return data.processId === req.params.processId;
     });
-    const error = processId[0].instances.filter(err => {
+    const error = processId[0].instances.filter((err) => {
       return err.processInstanceId === req.params.processInstanceId;
     });
     switch (error[0].retrigger) {
@@ -40,10 +64,10 @@ module.exports = controller = {
   },
   callSkip: (req, res) => {
     const { process } = restData.management;
-    const processId = process.filter(data => {
+    const processId = process.filter((data) => {
       return data.processId === req.params.processId;
     });
-    const error = processId[0].instances.filter(err => {
+    const error = processId[0].instances.filter((err) => {
       return err.processInstanceId === req.params.processInstanceId;
     });
     switch (error[0].skip) {
@@ -62,8 +86,11 @@ module.exports = controller = {
     }
   },
   callAbort: (req, res) => {
-    const failedAbortInstances = ['8035b580-6ae4-4aa8-9ec0-e18e19809e0b2', '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3']
-    const data = graphData.ProcessInstanceData.filter(data => {
+    const failedAbortInstances = [
+      '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
+      '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3'
+    ];
+    const data = graphData.ProcessInstanceData.filter((data) => {
       return data.id === req.params.processInstanceId;
     });
     if (failedAbortInstances.includes(data[0].id)) {
@@ -74,58 +101,64 @@ module.exports = controller = {
     }
   },
   callNodeRetrigger: (req, res) => {
-    const data = graphData.ProcessInstanceData.filter(data => {
+    const data = graphData.ProcessInstanceData.filter((data) => {
       return data.id === req.params.processInstanceId;
     });
-    const nodeObject = data[0].nodes.filter(node => node.id === req.params.nodeInstanceId);
+    const nodeObject = data[0].nodes.filter(
+      (node) => node.id === req.params.nodeInstanceId
+    );
     if (nodeObject[0].name.includes('not found')) {
-      res.status(404).send('node not found')
-    }
-    else {
+      res.status(404).send('node not found');
+    } else {
       nodeObject[0].enter = new Date().toISOString();
       res.status(200).send(data[0]);
     }
   },
   callNodeCancel: (req, res) => {
-    const data = graphData.ProcessInstanceData.filter(data => {
+    const data = graphData.ProcessInstanceData.filter((data) => {
       return data.id === req.params.processInstanceId;
     });
-    const nodeObject = data[0].nodes.filter(node => node.id === req.params.nodeInstanceId);
+    const nodeObject = data[0].nodes.filter(
+      (node) => node.id === req.params.nodeInstanceId
+    );
     if (nodeObject[0].name.includes('not found')) {
-      res.status(404).send('node not found')
-    }
-    else {
+      res.status(404).send('node not found');
+    } else {
       nodeObject[0].exit = new Date().toISOString();
       res.status(200).send(data[0]);
     }
   },
   handleJobReschedule: (req, res) => {
-    const data = graphData.JobsData.find(data => {
+    const data = graphData.JobsData.find((data) => {
       return data.id === req.params.id;
     });
-    if (req.params.id !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0" && req.body.repeatInterval && req.body.repeatLimit) {
+    if (
+      req.params.id !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0' &&
+      req.body.repeatInterval &&
+      req.body.repeatLimit
+    ) {
       data.expirationTime = req.body.expirationTime;
       data.repeatInterval = req.body.repeatInterval;
       data.repeatLimit = req.body.repeatLimit;
     } else {
-      if (req.params.id !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0") {
+      if (req.params.id !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0') {
         data.expirationTime = req.body.expirationTime;
       }
     }
-    if (req.params.id !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0") {
+    if (req.params.id !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0') {
       res.status(200).send(data);
     } else {
-      res.status(400).send('job not rescheduled')
+      res.status(400).send('job not rescheduled');
     }
   },
 
   callNodeTrigger: (req, res) => {
     const processInstance = graphData.ProcessInstanceData.filter((process) => {
-      return process.id === req.params.processInstanceId
+      return process.id === req.params.processInstanceId;
     });
     const nodeObject = processInstance[0].nodes.filter((node, index) => {
       if (index !== processInstance[0].nodes.length - 1) {
-        return node.id === req.params.nodeId
+        return node.id === req.params.nodeId;
       }
     });
     if (nodeObject.length === 0) {
@@ -143,38 +176,40 @@ module.exports = controller = {
     if (req.params.processId !== null || req.params.processId !== undefined) {
       res.send([
         {
-          nodeDefinitionId: "_BDA56801-1155-4AF2-94D4-7DAADED2E3C0",
-          name: "Send visa application",
+          nodeDefinitionId: '_BDA56801-1155-4AF2-94D4-7DAADED2E3C0',
+          name: 'Send visa application',
           id: 1,
-          type: "ActionNode",
-          uniqueId: "1"
+          type: 'ActionNode',
+          uniqueId: '1'
         },
         {
-          nodeDefinitionId: "_175DC79D-C2F1-4B28-BE2D-B583DFABF70D",
-          name: "Book",
+          nodeDefinitionId: '_175DC79D-C2F1-4B28-BE2D-B583DFABF70D',
+          name: 'Book',
           id: 2,
-          type: "Split",
-          uniqueId: "2"
+          type: 'Split',
+          uniqueId: '2'
         },
         {
-          nodeDefinitionId: "_E611283E-30B0-46B9-8305-768A002C7518",
-          name: "visasrejected",
+          nodeDefinitionId: '_E611283E-30B0-46B9-8305-768A002C7518',
+          name: 'visasrejected',
           id: 3,
-          type: "EventNode",
-          uniqueId: "3"
+          type: 'EventNode',
+          uniqueId: '3'
         }
-      ])
+      ]);
     } else {
-      res.send([])
+      res.send([]);
     }
   },
 
   callJobCancel: (req, res) => {
-    const mockFailedJobs = ['dad3aa88-5c1e-4858-a919-6123c675a0fa_0']
+    const mockFailedJobs = ['dad3aa88-5c1e-4858-a919-6123c675a0fa_0'];
     const graphData = require('./graphql');
-    const jobData = graphData.JobsData.filter(job => job.id === req.params.jobId);
+    const jobData = graphData.JobsData.filter(
+      (job) => job.id === req.params.jobId
+    );
     if (mockFailedJobs.includes(jobData[0].id) || jobData.length === 0) {
-      res.status(404).send('job not found')
+      res.status(404).send('job not found');
     } else {
       jobData[0].status = 'CANCELED';
       jobData[0].lastUpdate = new Date().toISOString();
@@ -183,20 +218,22 @@ module.exports = controller = {
   },
   dispatchSVG: (req, res) => {
     try {
-      if(processSvg.includes(req.params.id)){
-        if(req.params.processId === 'travels') {
-          console.log('travels')
-          res.sendFile(path.resolve(__dirname+'/../static/travels.svg'))
+      if (processSvg.includes(req.params.id)) {
+        if (req.params.processId === 'travels') {
+          console.log('travels');
+          res.sendFile(path.resolve(__dirname + '/../static/travels.svg'));
         } else if (req.params.processId === 'flightBooking') {
-          res.sendFile(path.resolve(__dirname+'/../static/flightBooking.svg'))
+          res.sendFile(
+            path.resolve(__dirname + '/../static/flightBooking.svg')
+          );
         } else if (req.params.processId === 'hotelBooking') {
-          res.sendFile(path.resolve(__dirname+'/../static/hotelBooking.svg'))
+          res.sendFile(path.resolve(__dirname + '/../static/hotelBooking.svg'));
         }
       } else {
         res.send(null);
       }
-    } catch(error){
-      res.status(404).send(error)
+    } catch (error) {
+      res.status(404).send(error);
     }
   }
 };
diff --git a/ui-packages/packages/management-console-webapp/server/MockData/graphql.js b/ui-packages/packages/management-console-webapp/server/MockData/graphql.js
index 746fdf25be..c3157f4390 100644
--- a/ui-packages/packages/management-console-webapp/server/MockData/graphql.js
+++ b/ui-packages/packages/management-console-webapp/server/MockData/graphql.js
@@ -1,3388 +1,3449 @@
-module.exports ={ ProcessInstanceData : [
-  {
-    id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
-    processId: 'hotelBooking',
-    businessKey: 'T1234HotelBooking01',
-    parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    parentProcessInstance: {
-      id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-      processName: 'travels',
-      businessKey: 'T1234'
-    },
-    processName: 'HotelBooking',
-    rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    roles: [],
-    state: 'COMPLETED',
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578e904e6b',
-      message: 'some thing went wrong'
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = {
+  ProcessInstanceData: [
+    {
+      id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
+      processId: 'hotelBooking',
+      businessKey: 'T1234HotelBooking01',
+      parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      parentProcessInstance: {
+        id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+        processName: 'travels',
+        businessKey: 'T1234'
+      },
+      processName: 'HotelBooking',
+      rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      roles: [],
+      state: 'COMPLETED',
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578e904e6b',
+        message: 'some thing went wrong'
+      },
+      addons: [],
+      variables:
+        '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '27107f38-d888-4edf-9a4f-11b9e6d751b6',
+          enter: '2019-10-22T03:37:30.798Z',
+          exit: '2019-10-22T03:37:30.798Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: '41b3f49e-beb3-4b5f-8130-efd28f82b971',
+          enter: '2019-10-22T03:37:30.795Z',
+          exit: '2019-10-22T03:37:30.798Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '2',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '4165a571-2c79-4fd0-921e-c6d5e7851b67',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.795Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: []
     },
-    addons: [],
-    variables:
-      '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '27107f38-d888-4edf-9a4f-11b9e6d751b6',
-        enter: '2019-10-22T03:37:30.798Z',
-        exit: '2019-10-22T03:37:30.798Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: '41b3f49e-beb3-4b5f-8130-efd28f82b971',
-        enter: '2019-10-22T03:37:30.795Z',
-        exit: '2019-10-22T03:37:30.798Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '2',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '4165a571-2c79-4fd0-921e-c6d5e7851b67',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.795Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
+    {
+      id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
+      processId: 'flightBooking',
+      businessKey: 'T1234FlightBooking01',
+      parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      parentProcessInstance: {
+        id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+        processName: 'travels',
+        businessKey: 'T1234'
       },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
-    processId: 'flightBooking',
-    businessKey: 'T1234FlightBooking01',
-    parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    parentProcessInstance: {
-      id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-      processName: 'travels',
-      businessKey: 'T1234'
-    },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    roles: [],
-    state: 'ERROR',
-    addons: ['jobs-management', 'prometheus-monitoring','process-management'],
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    error: {
-      nodeDefinitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
-      message:
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+      processName: 'FlightBooking',
+      rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      roles: [],
+      state: 'ERROR',
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      error: {
+        nodeDefinitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
+        message:
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'e6c20-02c2-4c2b-8c5c-e988a0adf87c',
+          id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
+          id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75ze6',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75a56',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75q76',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: []
     },
-    start: '2019-10-22T03:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'e6c20-02c2-4c2b-8c5c-e988a0adf87c',
-        id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
-        id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75ze6',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75a56',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75q76',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
+    {
+      id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
+      processId: 'flightBooking',
+      businessKey: 'T1234FlightBooking02',
+      parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      parentProcessInstance: {
+        id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+        processName: 'travels',
+        businessKey: 'T1234'
       },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
-    processId: 'flightBooking',
-    businessKey: 'T1234FlightBooking02',
-    parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    parentProcessInstance: {
+      processName: 'FlightBooking',
+      rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      endpoint: 'http://localhost:4000',
+      error: {
+        nodeDefinitionId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf823',
+        message: 'some thing went wrong'
+      },
+      addons: [],
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d751g6',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75v36',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75o96',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: []
+    },
+    {
       id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      processId: 'travels',
+      businessKey: 'T1234',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: 'T1234'
+      roles: [],
+      state: 'ERROR',
+      rootProcessInstanceId: null,
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
+          enter: '2019-10-22T03:37:38.586Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
+          enter: '2019-10-22T03:37:30.807Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '4',
+          name: 'Join',
+          definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+          id: '08c153e8-2766-4675-81f7-29943efdf411',
+          enter: '2019-10-22T03:37:30.806Z',
+          exit: '2019-10-22T03:37:30.807Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
+          enter: '2019-10-22T03:37:30.803Z',
+          exit: '2019-10-22T03:37:30.806Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '415a52c0-dc1f-4a93-9238-862dc8072262',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: '52d64298-3f28-4aba-a812-dba4077c9665',
+          enter: '2019-10-22T03:37:30.79Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
+          enter: '2019-10-22T03:37:30.755Z',
+          exit: '2019-10-22T03:37:30.79Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
+          enter: '2019-10-22T03:37:30.753Z',
+          exit: '2019-10-22T03:37:30.754Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m26',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75uu26',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75mi86',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: [
+        {
+          id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
+          processName: 'FlightBooking',
+          businessKey: 'T1234FlightBooking02'
+        },
+        {
+          id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
+          processName: 'HotelBooking',
+          businessKey: 'T1234HotelBooking01'
+        },
+        {
+          id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
+          processName: 'FlightBooking',
+          businessKey: 'T1234FlightBooking01'
+        }
+      ]
     },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    endpoint: 'http://localhost:4000',
-    error: {
-      nodeDefinitionId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf823',
-      message: 'some thing went wrong'
+
+    {
+      id: 'tEE12-fo54-l665-mp112-akou112345566',
+      processId: 'travels',
+      businessKey: 'TEE12',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      state: 'ERROR',
+      rootProcessInstanceId: null,
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
+          enter: '2019-10-22T03:37:38.586Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
+          enter: '2019-10-22T03:37:30.807Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '4',
+          name: 'Join',
+          definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+          id: '08c153e8-2766-4675-81f7-29943efdf411',
+          enter: '2019-10-22T03:37:30.806Z',
+          exit: '2019-10-22T03:37:30.807Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
+          enter: '2019-10-22T03:37:30.803Z',
+          exit: '2019-10-22T03:37:30.806Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '415a52c0-dc1f-4a93-9238-862dc8072262',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: '52d64298-3f28-4aba-a812-dba4077c9665',
+          enter: '2019-10-22T03:37:30.79Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
+          enter: '2019-10-22T03:37:30.755Z',
+          exit: '2019-10-22T03:37:30.79Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
+          enter: '2019-10-22T03:37:30.753Z',
+          exit: '2019-10-22T03:37:30.754Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    addons: [],
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d751g6',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75v36',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75o96',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    processId: 'travels',
-    businessKey: 'T1234',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ERROR',
-    rootProcessInstanceId: null,
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-      message: 'Something went wrong'
+    {
+      id: 'RZ11-tu77-hj321-bnfhe1-xdr2134',
+      processId: 'travels',
+      businessKey: 'MPTQ',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      state: 'ERROR',
+      rootProcessInstanceId: null,
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
+          enter: '2019-10-22T03:37:38.586Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
+          enter: '2019-10-22T03:37:30.807Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '4',
+          name: 'Join',
+          definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+          id: '08c153e8-2766-4675-81f7-29943efdf411',
+          enter: '2019-10-22T03:37:30.806Z',
+          exit: '2019-10-22T03:37:30.807Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
+          enter: '2019-10-22T03:37:30.803Z',
+          exit: '2019-10-22T03:37:30.806Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '415a52c0-dc1f-4a93-9238-862dc8072262',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: '52d64298-3f28-4aba-a812-dba4077c9665',
+          enter: '2019-10-22T03:37:30.79Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
+          enter: '2019-10-22T03:37:30.755Z',
+          exit: '2019-10-22T03:37:30.79Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
+          enter: '2019-10-22T03:37:30.753Z',
+          exit: '2019-10-22T03:37:30.754Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: "http://localhost:4000",
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
-        enter: '2019-10-22T03:37:38.586Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
-        enter: '2019-10-22T03:37:30.807Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '4',
-        name: 'Join',
-        definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-        id: '08c153e8-2766-4675-81f7-29943efdf411',
-        enter: '2019-10-22T03:37:30.806Z',
-        exit: '2019-10-22T03:37:30.807Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
-        enter: '2019-10-22T03:37:30.803Z',
-        exit: '2019-10-22T03:37:30.806Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '415a52c0-dc1f-4a93-9238-862dc8072262',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: '52d64298-3f28-4aba-a812-dba4077c9665',
-        enter: '2019-10-22T03:37:30.79Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
-        enter: '2019-10-22T03:37:30.755Z',
-        exit: '2019-10-22T03:37:30.79Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
-        enter: '2019-10-22T03:37:30.753Z',
-        exit: '2019-10-22T03:37:30.754Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m26',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75uu26',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75mi86',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-    ],
-    childProcessInstances: [
-      {
-        id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
-        processName: 'FlightBooking',
-        businessKey: 'T1234FlightBooking02'
-      },
-      {
-        id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
-        processName: 'HotelBooking',
-        businessKey: 'T1234HotelBooking01'
+    {
+      id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
+      processId: 'flightBooking',
+      businessKey: 'Tra234FlightBooking01',
+      parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      parentProcessInstance: {
+        id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+        processName: 'travels',
+        businessKey: 'Tra234'
       },
-      {
-        id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
-        processName: 'FlightBooking',
-        businessKey: 'T1234FlightBooking01'
-      }
-    ]
-  },
-
-  {
-    id: 'tEE12-fo54-l665-mp112-akou112345566',
-    processId: 'travels',
-    businessKey: 'TEE12',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ERROR',
-    rootProcessInstanceId: null,
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-      message: 'Something went wrong'
+      processName: 'FlightBooking',
+      rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      roles: [],
+      state: 'ERROR',
+      addons: ['prometheus-monitoring'],
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
+        message:
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+      },
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '18d9e3df-22d2-429c-98d7-f4f2a7b1b471',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.086Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
+          id: '8a533611-9766-428f-b7ff-78156fc4851d',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.086Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '2f423120-13ea-4277-97f6-6b7a4b4630d0',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.086Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
-        enter: '2019-10-22T03:37:38.586Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
-        enter: '2019-10-22T03:37:30.807Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '4',
-        name: 'Join',
-        definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-        id: '08c153e8-2766-4675-81f7-29943efdf411',
-        enter: '2019-10-22T03:37:30.806Z',
-        exit: '2019-10-22T03:37:30.807Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
-        enter: '2019-10-22T03:37:30.803Z',
-        exit: '2019-10-22T03:37:30.806Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '415a52c0-dc1f-4a93-9238-862dc8072262',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: '52d64298-3f28-4aba-a812-dba4077c9665',
-        enter: '2019-10-22T03:37:30.79Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
-        enter: '2019-10-22T03:37:30.755Z',
-        exit: '2019-10-22T03:37:30.79Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
-        enter: '2019-10-22T03:37:30.753Z',
-        exit: '2019-10-22T03:37:30.754Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'RZ11-tu77-hj321-bnfhe1-xdr2134',
-    processId: 'travels',
-    businessKey: 'MPTQ',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ERROR',
-    rootProcessInstanceId: null,
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-      message: 'Something went wrong'
+    {
+      id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
+      processId: 'hotelBooking',
+      businessKey: 'Tra234HotelBooking01',
+      parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      parentProcessInstance: {
+        id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+        processName: 'travels',
+        businessKey: 'Tra234'
+      },
+      rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      processName: 'HotelBooking',
+      roles: [],
+      state: 'ABORTED',
+      addons: ['process-management'],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578ek1839b',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: 'ed36cd72-5e52-4a53-9d0d-865c98781282',
+          enter: '2019-10-22T03:40:44.088Z',
+          exit: '2019-10-22T03:40:44.088Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: '040cd02a-7f4c-4d41-bda5-4889f82e921f',
+          enter: '2019-10-22T03:40:44.088Z',
+          exit: '2019-10-22T03:40:44.088Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '8528c7bf-8ac8-401f-b7e5-6f3e69b9f9f2',
+          enter: '2019-10-22T03:40:44.088Z',
+          exit: '2019-10-22T03:40:44.088Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
-        enter: '2019-10-22T03:37:38.586Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
-        enter: '2019-10-22T03:37:30.807Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '4',
-        name: 'Join',
-        definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-        id: '08c153e8-2766-4675-81f7-29943efdf411',
-        enter: '2019-10-22T03:37:30.806Z',
-        exit: '2019-10-22T03:37:30.807Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
-        enter: '2019-10-22T03:37:30.803Z',
-        exit: '2019-10-22T03:37:30.806Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '415a52c0-dc1f-4a93-9238-862dc8072262',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: '52d64298-3f28-4aba-a812-dba4077c9665',
-        enter: '2019-10-22T03:37:30.79Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
-        enter: '2019-10-22T03:37:30.755Z',
-        exit: '2019-10-22T03:37:30.79Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
-        enter: '2019-10-22T03:37:30.753Z',
-        exit: '2019-10-22T03:37:30.754Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
-    processId: 'flightBooking',
-    businessKey: 'Tra234FlightBooking01',
-    parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    parentProcessInstance: {
+    {
       id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      processId: 'travels',
+      businessKey: 'Tra234',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: 'Tra234'
+      rootProcessInstanceId: null,
+      roles: [],
+      state: 'ERROR',
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      error: {
+        nodeDefinitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Confirm travel',
+          definitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
+          id: '69e0a0f5-2360-4174-a8f8-a892a31fc2f9',
+          enter: '2019-10-22T03:40:44.089Z',
+          exit: '2019-10-22T04:42:07.246Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '4cb855b9-e3e4-488d-ae1a-9ea3b8490dba',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.087Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: '1da9af80-c70e-47b8-9c87-964468fc0b46',
+          enter: '2019-10-22T03:40:44.089Z',
+          exit: '2019-10-22T03:40:44.089Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'f9b90c32-51da-4986-9603-8c800a6b71b1',
+          enter: '2019-10-22T03:40:44.087Z',
+          exit: '2019-10-22T03:40:44.089Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'f8d7fe9e-0f3e-4919-8fa7-82e0b6821aa9',
+          enter: '2019-10-22T03:40:44.085Z',
+          exit: '2019-10-22T03:40:44.087Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '55fd6d56-e4d4-4021-b6c6-02c3c5cb86ce',
+          enter: '2019-10-22T03:40:44.085Z',
+          exit: '2019-10-22T03:40:44.085Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'fe6b2d9e-6cfd-415a-8e92-5d2be541c3ff',
+          enter: '2019-10-22T03:40:44.085Z',
+          exit: '2019-10-22T03:40:44.085Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '3bd30bf9-96ba-4f5d-9ed0-981963288418',
+          enter: '2019-10-22T03:40:44.07Z',
+          exit: '2019-10-22T03:40:44.085Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '739fc473-157d-4b4e-8ad6-e4c28499d24e',
+          enter: '2019-10-22T03:40:44.07Z',
+          exit: '2019-10-22T03:40:44.07Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
+          processName: 'FlightBooking',
+          businessKey: 'Tra234FlightBooking01'
+        },
+        {
+          id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
+          processName: 'HotelBooking',
+          businessKey: 'Tra234HotelBooking01'
+        }
+      ]
     },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    roles: [],
-    state: 'ERROR',
-    addons: ['prometheus-monitoring'],
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
-      message:
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: '_175DC79D-C2F1-4B28-BE2D-B583DFABF70D',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '18d9e3df-22d2-429c-98d7-f4f2a7b1b471',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.086Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
-        id: '8a533611-9766-428f-b7ff-78156fc4851d',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.086Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '2f423120-13ea-4277-97f6-6b7a4b4630d0',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.086Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
-    processId: 'hotelBooking',
-    businessKey: 'Tra234HotelBooking01',
-    parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    parentProcessInstance: {
-      id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop',
+      processId: 'travels',
+      businessKey: 'Tr1122',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: 'Tra234'
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-12-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel not found',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m88',
+          name: 'Milestone 3: Order delivered and closed with customer sign off',
+          status: 'ACTIVE'
+        }
+      ],
+      childProcessInstances: []
     },
-    rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    processName: 'HotelBooking',
-    roles: [],
-    state: 'ABORTED',
-    addons: ['process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578ek1839b',
-      message: 'Something went wrong'
+    {
+      id: 'e735128t-6tt7-4aa8-9ec0-e18e19809e0b',
+      processId: 'travels',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      businessKey: null,
+      state: 'COMPLETED',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-12-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: 'ed36cd72-5e52-4a53-9d0d-865c98781282',
-        enter: '2019-10-22T03:40:44.088Z',
-        exit: '2019-10-22T03:40:44.088Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: '040cd02a-7f4c-4d41-bda5-4889f82e921f',
-        enter: '2019-10-22T03:40:44.088Z',
-        exit: '2019-10-22T03:40:44.088Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '8528c7bf-8ac8-401f-b7e5-6f3e69b9f9f2',
-        enter: '2019-10-22T03:40:44.088Z',
-        exit: '2019-10-22T03:40:44.088Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    processId: 'travels',
-    businessKey: 'Tra234',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    rootProcessInstanceId: null,
-    roles: [],
-    state: 'ERROR',
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    error: {
-      nodeDefinitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0bccddee',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      processName: 'travels',
+      roles: [],
+      state: 'SUSPENDED',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Confirm travel',
-        definitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
-        id: '69e0a0f5-2360-4174-a8f8-a892a31fc2f9',
-        enter: '2019-10-22T03:40:44.089Z',
-        exit: '2019-10-22T04:42:07.246Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '4cb855b9-e3e4-488d-ae1a-9ea3b8490dba',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.087Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: '1da9af80-c70e-47b8-9c87-964468fc0b46',
-        enter: '2019-10-22T03:40:44.089Z',
-        exit: '2019-10-22T03:40:44.089Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'f9b90c32-51da-4986-9603-8c800a6b71b1',
-        enter: '2019-10-22T03:40:44.087Z',
-        exit: '2019-10-22T03:40:44.089Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'f8d7fe9e-0f3e-4919-8fa7-82e0b6821aa9',
-        enter: '2019-10-22T03:40:44.085Z',
-        exit: '2019-10-22T03:40:44.087Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '55fd6d56-e4d4-4021-b6c6-02c3c5cb86ce',
-        enter: '2019-10-22T03:40:44.085Z',
-        exit: '2019-10-22T03:40:44.085Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'fe6b2d9e-6cfd-415a-8e92-5d2be541c3ff',
-        enter: '2019-10-22T03:40:44.085Z',
-        exit: '2019-10-22T03:40:44.085Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '3bd30bf9-96ba-4f5d-9ed0-981963288418',
-        enter: '2019-10-22T03:40:44.07Z',
-        exit: '2019-10-22T03:40:44.085Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '739fc473-157d-4b4e-8ad6-e4c28499d24e',
-        enter: '2019-10-22T03:40:44.07Z',
-        exit: '2019-10-22T03:40:44.07Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
-        processName: 'FlightBooking',
-        businessKey: 'Tra234FlightBooking01'
+    {
+      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+      processId: 'flightBooking',
+      businessKey: 'Trrr',
+      parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      parentProcessInstance: {
+        id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+        processName: 'travels',
+        businessKey: null
       },
-      {
-        id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
-        processName: 'HotelBooking',
-        businessKey: 'Tra234HotelBooking01'
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+      processName: 'FlightBooking',
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2f588da5-a323-4111-9017-3093ef9319d1',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
+          processName: 'FlightBooking test 1',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: '_175DC79D-C2F1-4B28-BE2D-B583DFABF70D',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
+    {
+      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
+      processId: 'flightBooking test1',
+      parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+      parentProcessInstance: {
         id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
         processName: 'FlightBooking',
         businessKey: null
       },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop',
-    processId: 'travels',
-    businessKey: 'Tr1122',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
-    },
-    start: '2019-12-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel not found',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m88',
-        name: 'Milestone 3: Order delivered and closed with customer sign off',
-        status: 'ACTIVE'
-      },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'e735128t-6tt7-4aa8-9ec0-e18e19809e0b',
-    processId: 'travels',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    businessKey: null,
-    state: 'COMPLETED',
-    rootProcessInstanceId: null,
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
-    },
-    start: '2019-12-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0bccddee',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    processName: 'travels',
-    roles: [],
-    state: 'SUSPENDED',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
-    },
-    start: '2019-10-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-    processId: 'flightBooking',
-    businessKey: "Trrr",
-    parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    parentProcessInstance: {
-      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-      processName: 'travels',
-      businessKey: null
-    },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
-      message: 'Something went wrong'
+      businessKey: null,
+      processName: 'FlightBooking test 1',
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      roles: [],
+      state: 'SUSPENDED',
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2f588da5-a323-4111-9017-3093ef9319d1',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
+          processName: 'FlightBooking test 2',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2f588da5-a323-4111-9017-3093ef9319d1',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
+    {
+      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
+      processId: 'flightBooking test2',
+      businessKey: 'TP444',
+      parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
+      parentProcessInstance: {
         id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
         processName: 'FlightBooking test 1',
         businessKey: null
-      }
-    ]
-  },
-  {
-    id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
-    processId: 'flightBooking test1',
-    parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-    parentProcessInstance: {
-      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-      processName: 'FlightBooking',
-      businessKey: null
-    },
-    businessKey: null,
-    processName: 'FlightBooking test 1',
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    roles: [],
-    state: 'SUSPENDED',
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
-      message: 'Something went wrong'
-    },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2f588da5-a323-4111-9017-3093ef9319d1',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'WorkItemNode'
       },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
-        processName: 'FlightBooking test 2',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
-    processId: 'flightBooking test2',
-    businessKey: "TP444",
-    parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
-    parentProcessInstance: {
-      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
-      processName: 'FlightBooking test 1',
-      businessKey: null
-    },
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    processName: 'FlightBooking test 2',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
-      message: 'Something went wrong'
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      processName: 'FlightBooking test 2',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2f588da5-a323-4111-9017-3093ef9319d1',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2f588da5-a323-4111-9017-3093ef9319d1',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-    processId: 'hotelBooking',
-    businessKey: "TM111",
-    parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    parentProcessInstance: {
-      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-      processName: 'travels',
-      businessKey: null
-    },
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    processName: 'HotelBooking',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring'],
-    error: {
-      nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
-      message: 'Something went wrong'
-    },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7a770672-8493-4566-8288-515c0b5360a8',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'WorkItemNode'
+    {
+      id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+      processId: 'hotelBooking',
+      businessKey: 'TM111',
+      parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      parentProcessInstance: {
+        id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+        processName: 'travels',
+        businessKey: null
       },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
-    processId: 'travels',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ABORTED',
-    businessKey: 'TL111',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      processName: 'HotelBooking',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: ['jobs-management', 'prometheus-monitoring'],
+      error: {
+        nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7a770672-8493-4566-8288-515c0b5360a8',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    start: '2019-12-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
-        processName: 'hotelBooking',
-        businessKey: 'Hotel11'
-      }
-    ]
-  },
-  {
-    id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
-    processId: 'hotelBooking',
-    parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
-    parentProcessInstance: {
+    {
       id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+      processId: 'travels',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: null
-    },
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
-    processName: 'HotelBooking',
-    businessKey: 'Hotel11',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring'],
-    error: {
-      nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
-      message: 'Something went wrong'
+      roles: [],
+      state: 'ABORTED',
+      businessKey: 'TL111',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-12-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
+          processName: 'hotelBooking',
+          businessKey: 'Hotel11'
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7a770672-8493-4566-8288-515c0b5360a8',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b1',
-    processId: 'travels',
-    businessKey: 'travels001',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels1',
-    roles: [],
-    state: 'ACTIVE',
-    serviceUrl: 'http://localhost:4000',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
-    },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
+    {
+      id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
+      processId: 'hotelBooking',
+      parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+      parentProcessInstance: {
+        id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+        processName: 'travels',
         businessKey: null
       },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
-    processId: 'travels',
-    businessKey: 'Tp111',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels2',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+      processName: 'HotelBooking',
+      businessKey: 'Hotel11',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: ['jobs-management', 'prometheus-monitoring'],
+      error: {
+        nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7a770672-8493-4566-8288-515c0b5360a8',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3',
-    processId: 'travels',
-    businessKey: 'Travels@123',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels3',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000/',
-    endpoint: 'http://localhost:4000/',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b1',
+      processId: 'travels',
+      businessKey: 'travels001',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels1',
+      roles: [],
+      state: 'ACTIVE',
+      serviceUrl: 'http://localhost:4000',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b4',
-    processId: 'travels',
-    businessKey: "TTTTT",
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels4',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
+      processId: 'travels',
+      businessKey: 'Tp111',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels2',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b5',
-    processId: 'travels',
-    businessKey: 'Tr11111111',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels5',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3',
+      processId: 'travels',
+      businessKey: 'Travels@123',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels3',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000/',
+      endpoint: 'http://localhost:4000/',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b6',
-    processId: 'travels',
-    businessKey: 'Trav99',
-    parentProcessInstance: null,
-    parentProcessInstanceId: null,
-    processName: 'travels6',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b4',
+      processId: 'travels',
+      businessKey: 'TTTTT',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels4',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b8',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels8',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b5',
+      processId: 'travels',
+      businessKey: 'Tr11111111',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels5',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b9',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels9',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b6',
+      processId: 'travels',
+      businessKey: 'Trav99',
+      parentProcessInstance: null,
+      parentProcessInstanceId: null,
+      processName: 'travels6',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b10',
-    processId: 'travels',
-    businessKey: 'newTravels',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels10',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b8',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels8',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b11',
-    processId: 'travels',
-    businessKey: 'Trav11test',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels11',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b9',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels9',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b12',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels12',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b10',
+      processId: 'travels',
+      businessKey: 'newTravels',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels10',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b13abbccccc',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels13',
-    roles: [],
-    state: 'COMPLETED',
-    rootProcessInstanceId: null,
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b11',
+      processId: 'travels',
+      businessKey: 'Trav11test',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels11',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  }
-],
-  JobsData:[
     {
-      id: "6e74a570-31c8-4020-bd70-19be2cb625f3_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b12',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels12',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
+    },
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b13abbccccc',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels13',
+      roles: [],
+      state: 'COMPLETED',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
+    }
+  ],
+  JobsData: [
+    {
+      id: '6e74a570-31c8-4020-bd70-19be2cb625f3_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
       rootProcessId: null,
-      status: "EXECUTED",
+      status: 'EXECUTED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0',
       repeatInterval: null,
       repeatLimit: null,
-      scheduledId: "0",
+      scheduledId: '0',
       retries: 1,
-      lastUpdate: "2020-08-27T03:35:50.147Z",
+      lastUpdate: '2020-08-27T03:35:50.147Z',
       expirationTime: null,
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
       executionCounter: 2
     },
     {
-      id: "dad3aa88-5c1e-4858-a919-6123c675a0fa_1",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "SCHEDULED",
+      id: 'dad3aa88-5c1e-4858-a919-6123c675a0fa_1',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 3,
-      lastUpdate: "2020-07-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-07-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: '843bd287-fb6e-4ee7-a304-ba9b430e52d8_1',
       executionCounter: 6
     },
     {
-      id: "2234dde-npce1-2908-b3131-6123c675a0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "CANCELED",
+      id: '2234dde-npce1-2908-b3131-6123c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'CANCELED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 2,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
       executionCounter: 0
     },
     {
-      id: "T3113e-vbg43-2234-lo89-cpmw3214ra0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "ERROR",
+      id: 'T3113e-vbg43-2234-lo89-cpmw3214ra0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'ERROR',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: 30300,
       repeatLimit: 3,
       scheduledId: null,
       retries: 7,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a_1',
       executionCounter: 3
     },
     {
-      id: "bff4ee-11qw23-6675-po987-qwedfrt45a0fa_5",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "RETRY",
+      id: 'bff4ee-11qw23-6675-po987-qwedfrt45a0fa_5',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'RETRY',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 15,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: 'b2761011-3043-4f48-82bd-1395bf651a91',
       executionCounter: 2
     },
     {
-      id: "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "SCHEDULED",
+      id: 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 2,
-      lastUpdate: "2020-06-29T03:35:54.635Z",
-      expirationTime: "2020-08-29T04:35:54.631Z",
+      lastUpdate: '2020-06-29T03:35:54.635Z',
+      expirationTime: '2020-08-29T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: null,
       executionCounter: 0
     },
     {
-      id: "dad3aa88-5c1e-4858-a919-uey23c675a0fa_0",
-      processId: "travels",
-      processInstanceId: "e4448857-fa0c-403b-ad69-f0a353458b9d",
-      rootProcessId: "",
-      status: "SCHEDULED",
+      id: 'dad3aa88-5c1e-4858-a919-uey23c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      rootProcessId: '',
+      status: 'SCHEDULED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 5,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: '08c153e8-2766-4675-81f7-29943efdf411_1',
       executionCounter: 0
     },
     {
-      id: "6e74a570-31c8-4020-bd70-o413be2cb625f3_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
+      id: '6e74a570-31c8-4020-bd70-o413be2cb625f3_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
       rootProcessId: null,
-      status: "EXECUTED",
+      status: 'EXECUTED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0',
       repeatInterval: null,
       repeatLimit: null,
-      scheduledId: "0",
+      scheduledId: '0',
       retries: 0,
-      lastUpdate: "2020-08-27T03:35:50.147Z",
+      lastUpdate: '2020-08-27T03:35:50.147Z',
       expirationTime: null,
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95_1',
       executionCounter: 5
     },
     {
-      id: "dad3aa88-5c1e-4858-a919-61ai21c675a0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "SCHEDULED",
+      id: 'dad3aa88-5c1e-4858-a919-61ai21c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 0,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
       executionCounter: 7
     },
     {
-      id: "2234dde-npce1-2908-b3131-i15333c675a0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "CANCELED",
+      id: '2234dde-npce1-2908-b3131-i15333c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'CANCELED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 0,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c_1',
       executionCounter: 3
     },
     {
-      id: "T3113e-vbg43-2234-lo89-u8103214ra0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "ERROR",
+      id: 'T3113e-vbg43-2234-lo89-u8103214ra0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'ERROR',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: 30300,
       repeatLimit: 3,
       scheduledId: null,
       retries: 0,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
       executionCounter: 2
     },
     {
-      id: "bff4ee-11qw23-6675-po987-qwedfrt45a0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "RETRY",
+      id: 'bff4ee-11qw23-6675-po987-qwedfrt45a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'RETRY',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 0,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: 'b2761011-3043-4f48-82bd-1395bf651a91_1',
       executionCounter: 9
     },
     {
-      id: "eff4ee-11qw23-6675-pokau97-ql10s5ut45a0fa_0",
-      processId: "travels",
-      processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-      rootProcessId: "",
-      status: "SCHEDULED",
+      id: 'eff4ee-11qw23-6675-pokau97-ql10s5ut45a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 0,
-      lastUpdate: "2020-08-29T03:35:54.635Z",
-      expirationTime: "2020-08-29T04:35:54.631Z",
+      lastUpdate: '2020-08-29T03:35:54.635Z',
+      expirationTime: '2020-08-29T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: null,
       executionCounter: 1
     },
     {
-      id: "dad3aa88-5c1e-4858-a919-781ns75a0fa_0",
-      processId: "travels",
-      processInstanceId: "e4448857-fa0c-403b-ad69-f0a353458b9d",
-      rootProcessId: "",
-      status: "SCHEDULED",
+      id: 'dad3aa88-5c1e-4858-a919-781ns75a0fa_0',
+      processId: 'travels',
+      processInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      rootProcessId: '',
+      status: 'SCHEDULED',
       priority: 0,
-      callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
       repeatInterval: null,
       repeatLimit: null,
       scheduledId: null,
       retries: 0,
-      lastUpdate: "2020-08-27T03:35:54.635Z",
-      expirationTime: "2020-08-27T04:35:54.631Z",
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
       endpoint: 'http://localhost:4000/jobs',
       nodeInstanceId: '08c153e8-2766-4675-81f7-29943efdf411',
       executionCounter: 8
     }
   ]
-}
\ No newline at end of file
+};
diff --git a/ui-packages/packages/management-console-webapp/server/MockData/mutationRest.js b/ui-packages/packages/management-console-webapp/server/MockData/mutationRest.js
index 32e9527137..f9db8b9132 100644
--- a/ui-packages/packages/management-console-webapp/server/MockData/mutationRest.js
+++ b/ui-packages/packages/management-console-webapp/server/MockData/mutationRest.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = restData = {
   management: {
     process: [
diff --git a/ui-packages/packages/management-console-webapp/server/MockData/rest.js b/ui-packages/packages/management-console-webapp/server/MockData/rest.js
index be9a5c32cf..4879f662f1 100644
--- a/ui-packages/packages/management-console-webapp/server/MockData/rest.js
+++ b/ui-packages/packages/management-console-webapp/server/MockData/rest.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = restData = {
   management: {
     process: [
@@ -74,7 +92,7 @@ module.exports = restData = {
             skip: 'success',
             retrigger: 'Authentication failed',
             aborted: 'Internal server error'
-          },
+          }
         ]
       }
     ]
diff --git a/ui-packages/packages/management-console-webapp/server/MockData/types.js b/ui-packages/packages/management-console-webapp/server/MockData/types.js
index 2417a5115a..a71cc2091c 100644
--- a/ui-packages/packages/management-console-webapp/server/MockData/types.js
+++ b/ui-packages/packages/management-console-webapp/server/MockData/types.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { gql } = require('apollo-server-express');
 module.exports = typeDefs = gql`
   scalar DateTime
diff --git a/ui-packages/packages/management-console-webapp/server/app.js b/ui-packages/packages/management-console-webapp/server/app.js
index 11030be829..a87ce7a13c 100644
--- a/ui-packages/packages/management-console-webapp/server/app.js
+++ b/ui-packages/packages/management-console-webapp/server/app.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const server = require('./server');
 
 server.listen();
diff --git a/ui-packages/packages/management-console-webapp/server/config/index.js b/ui-packages/packages/management-console-webapp/server/config/index.js
index 269f1d2d06..5fd12d5369 100644
--- a/ui-packages/packages/management-console-webapp/server/config/index.js
+++ b/ui-packages/packages/management-console-webapp/server/config/index.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const commonConfig = {
   env: process.env.NODE_ENV || 'development',
   port: parseInt(process.env.PORT, 10) || 4000,
diff --git a/ui-packages/packages/management-console-webapp/server/server.js b/ui-packages/packages/management-console-webapp/server/server.js
index e9e5c636df..74251a555d 100644
--- a/ui-packages/packages/management-console-webapp/server/server.js
+++ b/ui-packages/packages/management-console-webapp/server/server.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 // HTTP SERVER
 const express = require('express');
 var cors = require('cors');
diff --git a/ui-packages/packages/management-console-webapp/src/apis/apis.tsx b/ui-packages/packages/management-console-webapp/src/apis/apis.tsx
index 7b0f2e072f..1811afb690 100644
--- a/ui-packages/packages/management-console-webapp/src/apis/apis.tsx
+++ b/ui-packages/packages/management-console-webapp/src/apis/apis.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 import { OperationType } from '@kogito-apps/management-console-shared/dist/components/BulkList';
 import {
diff --git a/ui-packages/packages/management-console-webapp/src/apis/index.ts b/ui-packages/packages/management-console-webapp/src/apis/index.ts
index 8bf1d798f7..09f8a8e884 100644
--- a/ui-packages/packages/management-console-webapp/src/apis/index.ts
+++ b/ui-packages/packages/management-console-webapp/src/apis/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './apis';
diff --git a/ui-packages/packages/management-console-webapp/src/apis/tests/apis.test.tsx b/ui-packages/packages/management-console-webapp/src/apis/tests/apis.test.tsx
index 95c88df228..1f311be604 100644
--- a/ui-packages/packages/management-console-webapp/src/apis/tests/apis.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/apis/tests/apis.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import axios from 'axios';
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 import wait from 'waait';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContext.ts b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContext.ts
index 0cfac247d0..3f95855145 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContext.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { JobsManagementGatewayApi } from './JobsManagementGatewayApi';
 
diff --git a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx
index b215f3dcf5..bda9b97197 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx
+++ b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ApolloClient } from 'apollo-client';
 import JobsManagementContext from '../../channel/JobsManagement/JobsManagementContext';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts
index 4cf662434f..84508e0677 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Job,
   JobStatus,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementQueries.ts b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementQueries.ts
index 8adbeb77b8..fdf675e762 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementQueries.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/JobsManagementQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import {
   Job,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/index.ts b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/index.ts
index 2ee783bbee..90eb2c3b3c 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/index.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { JobsManagementGatewayApi } from './JobsManagementGatewayApi';
 export * from './JobsManagementContext';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts
index e895253443..ac2cee5e84 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { JobsManagementQueries } from '../JobsManagementQueries';
 import {
   Job,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts
index 72b1a837ae..cc56c561e4 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { act } from 'react-dom/test-utils';
 import reactApollo from 'react-apollo';
 import { GraphQLJobsManagementQueries } from '../JobsManagementQueries';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts
index f5276a5e5d..727f418457 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { ProcessDetailsGatewayApi } from './ProcessDetailsGatewayApi';
 
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx
index d1765cd180..846e1e7579 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ApolloClient } from 'apollo-client';
 import ProcessDetailsContext from './ProcessDetailsContext';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts
index a848dc71fc..bb209e17d9 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDetailsQueries } from './ProcessDetailsQueries';
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts
index 2283a30bfb..00b1b7b55e 100755
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/index.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/index.ts
index 690f17c159..92a52bc815 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/index.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { ProcessDetailsGatewayApi } from './ProcessDetailsGatewayApi';
 export * from './ProcessDetailsContext';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts
index 92820c5930..6a86b6ae85 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDetailsQueries } from '../ProcessDetailsQueries';
 import {
   Job,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts
index ef3be61878..c9f92325ce 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { act } from 'react-dom/test-utils';
 import reactApollo from 'react-apollo';
 import { GraphQLProcessDetailsQueries } from '../ProcessDetailsQueries';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContext.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContext.ts
index 002e2ab518..78c332c5ac 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContext.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { ProcessListGatewayApi } from './ProcessListGatewayApi';
 
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx
index bc1c288466..f232b1bc45 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useMemo } from 'react';
 import { ApolloClient } from 'apollo-client';
 import ProcessListContext from '../../channel/ProcessList/ProcessListContext';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts
index 3c4ac0bbbf..a1e9aa1b32 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListQueries.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListQueries.ts
index ca4ede832d..83cd78cab1 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListQueries.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/ProcessListQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/index.ts b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/index.ts
index 466cb8333a..7cbbd9a3ec 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/index.ts
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { ProcessListGatewayApi } from './ProcessListGatewayApi';
 export * from './ProcessListContext';
 export { default as ProcessListContextProvider } from './ProcessListContextProvider';
diff --git a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx
index b8b6347ec0..4dcfa74945 100644
--- a/ui-packages/packages/management-console-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ProcessInstance,
   ProcessInstanceState,
diff --git a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/ManagementConsole.tsx b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/ManagementConsole.tsx
index 0faf7105be..432626b54d 100644
--- a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/ManagementConsole.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/ManagementConsole.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import { ApolloProvider } from 'react-apollo';
diff --git a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/tests/ManagementConsole.test.tsx b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/tests/ManagementConsole.test.tsx
index ea1369bbbd..22e0810211 100644
--- a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/tests/ManagementConsole.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsole/tests/ManagementConsole.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import ManagementConsole from '../ManagementConsole';
diff --git a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/ManagementConsoleNav.tsx b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/ManagementConsoleNav.tsx
index 8bb736cd5e..d33ad0f018 100644
--- a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/ManagementConsoleNav.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/ManagementConsoleNav.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   Nav,
diff --git a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/tests/ManagementConsoleNav.test.tsx b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/tests/ManagementConsoleNav.test.tsx
index 64792084a1..d90cf3707a 100644
--- a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/tests/ManagementConsoleNav.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleNav/tests/ManagementConsoleNav.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import ManagementConsoleNav from '../ManagementConsoleNav';
diff --git a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/ManagementConsoleRoutes.tsx b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/ManagementConsoleRoutes.tsx
index 4d61c2f7e4..02dc4c5193 100644
--- a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/ManagementConsoleRoutes.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/ManagementConsoleRoutes.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import {
diff --git a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/tests/ManagementConsoleRoutes.test.tsx b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/tests/ManagementConsoleRoutes.test.tsx
index f320989516..8c91de9b8d 100644
--- a/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/tests/ManagementConsoleRoutes.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/console/ManagementConsoleRoutes/tests/ManagementConsoleRoutes.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import ManagementConsoleRoutes from '../ManagementConsoleRoutes';
diff --git a/ui-packages/packages/management-console-webapp/src/components/console/index.ts b/ui-packages/packages/management-console-webapp/src/components/console/index.ts
index 7097398b0a..ff0ff773e6 100644
--- a/ui-packages/packages/management-console-webapp/src/components/console/index.ts
+++ b/ui-packages/packages/management-console-webapp/src/components/console/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as ManagementConsole } from './ManagementConsole/ManagementConsole';
 export { default as ManagementConsoleNav } from './ManagementConsoleNav/ManagementConsoleNav';
 export { default as ManagementConsoleRoutes } from './ManagementConsoleRoutes/ManagementConsoleRoutes';
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx
index a1857932d6..182e226109 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { OUIAProps } from '@kogito-apps/ouia-tools/dist/utils/OuiaUtils';
 import { EmbeddedJobsManagement } from '@kogito-apps/jobs-management';
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx
index f5e871b2ab..a5f9686856 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { mount } from 'enzyme';
 import React from 'react';
 import JobsManagementContainer from '../JobsManagementContainer';
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
index 00e46a1ee1..06327323aa 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/__mocks__/ProcessDetailsContainer.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/__mocks__/ProcessDetailsContainer.tsx
index be541da2d4..c6fa364c52 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/__mocks__/ProcessDetailsContainer.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/__mocks__/ProcessDetailsContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx
index cad07369e5..a6dc041815 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { mount } from 'enzyme';
 import React from 'react';
 import { ProcessInstance } from '@kogito-apps/management-console-shared/dist/types';
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
index 5f651da3f5..850c566bb6 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { OUIAProps } from '@kogito-apps/ouia-tools/dist/utils/OuiaUtils';
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx
index 98c1f9ddae..c53a7af7ee 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx
index fb1ceb9e10..8135e951aa 100644
--- a/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import { ProcessListState } from '@kogito-apps/management-console-shared/dist/types';
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx
index c55fee7040..d3016da614 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx
index bc525cc087..23867aaad1 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedJobsManagementPage: React.FC = () => {
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx
index f2eb419b44..f79031c2ba 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { mount } from 'enzyme';
 import React from 'react';
 import JobsManagementPage from '../JobsManagementPage';
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
index 28a58382c4..29b19f498f 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState, useEffect } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx
index e3c23351f0..496f26b325 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessDetailsPage: React.FC = () => {
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx
index 48c172d370..a23a47a4b5 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import * as H from 'history';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/ProcessListPage.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/ProcessListPage.tsx
index 0b262408e1..8f2488846c 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/ProcessListPage.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/ProcessListPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/__mocks__/ProcessListPage.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/__mocks__/ProcessListPage.tsx
index 97eda1eefe..b5dd5f284e 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/__mocks__/ProcessListPage.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/__mocks__/ProcessListPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/tests/ProcessListPage.test.tsx b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/tests/ProcessListPage.test.tsx
index 4b5b19f951..2fb45033c6 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/tests/ProcessListPage.test.tsx
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/ProcessListPage/tests/ProcessListPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import ProcessListPage from '../ProcessListPage';
diff --git a/ui-packages/packages/management-console-webapp/src/components/pages/index.ts b/ui-packages/packages/management-console-webapp/src/components/pages/index.ts
index 683e910a88..8909d2a8e4 100644
--- a/ui-packages/packages/management-console-webapp/src/components/pages/index.ts
+++ b/ui-packages/packages/management-console-webapp/src/components/pages/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as JobsManagementPage } from './JobsManagementPage/JobsManagementPage';
 export { default as ProcessListPage } from './ProcessListPage/ProcessListPage';
 export { default as ProcessDetailsPage } from './ProcessDetailsPage/ProcessDetailsPage';
diff --git a/ui-packages/packages/management-console-webapp/src/components/styles.css b/ui-packages/packages/management-console-webapp/src/components/styles.css
index 08e50e932b..8532964375 100644
--- a/ui-packages/packages/management-console-webapp/src/components/styles.css
+++ b/ui-packages/packages/management-console-webapp/src/components/styles.css
@@ -1,20 +1,22 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-management-console__card-size {
-    height: 100%;
-    position: relative;
+  height: 100%;
+  position: relative;
 }
diff --git a/ui-packages/packages/management-console-webapp/src/index.html b/ui-packages/packages/management-console-webapp/src/index.html
index f60bcca0a9..64bce1682d 100644
--- a/ui-packages/packages/management-console-webapp/src/index.html
+++ b/ui-packages/packages/management-console-webapp/src/index.html
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
   <head>
@@ -9,6 +29,6 @@
   </head>
   <body class="pf-m-redhat-font">
     <noscript>Enabling JavaScript is required to run this app.</noscript>
-    <div id="root" style="height: 100%;"></div>
+    <div id="root" style="height: 100%"></div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ui-packages/packages/management-console-webapp/src/index.tsx b/ui-packages/packages/management-console-webapp/src/index.tsx
index bfee9cd81f..4a4f6a665a 100644
--- a/ui-packages/packages/management-console-webapp/src/index.tsx
+++ b/ui-packages/packages/management-console-webapp/src/index.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ApolloClient from 'apollo-client';
diff --git a/ui-packages/packages/management-console-webapp/src/utils/QueryUtils.ts b/ui-packages/packages/management-console-webapp/src/utils/QueryUtils.ts
index c9e09f3ef1..113e38abfb 100644
--- a/ui-packages/packages/management-console-webapp/src/utils/QueryUtils.ts
+++ b/ui-packages/packages/management-console-webapp/src/utils/QueryUtils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessInstanceFilter } from '@kogito-apps/management-console-shared';
 
 const formatSearchWords = (searchWords: string[]) => {
diff --git a/ui-packages/packages/management-console-webapp/src/utils/tests/QueryUtils.test.ts b/ui-packages/packages/management-console-webapp/src/utils/tests/QueryUtils.test.ts
index 83f1abdb8c..336672fe7e 100644
--- a/ui-packages/packages/management-console-webapp/src/utils/tests/QueryUtils.test.ts
+++ b/ui-packages/packages/management-console-webapp/src/utils/tests/QueryUtils.test.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { ProcessInstanceState } from '@kogito-apps/management-console-shared/dist/types';
 import { buildProcessListWhereArgument } from '../QueryUtils';
 
diff --git a/ui-packages/packages/management-console-webapp/webpack.common.js b/ui-packages/packages/management-console-webapp/webpack.common.js
index 27578136d4..556af73b63 100755
--- a/ui-packages/packages/management-console-webapp/webpack.common.js
+++ b/ui-packages/packages/management-console-webapp/webpack.common.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -12,9 +30,9 @@ module.exports = {
   devServer: {
     client: {
       overlay: {
-        runtimeErrors: false,
-      },
-    },
+        runtimeErrors: false
+      }
+    }
   },
   plugins: [
     new HtmlWebpackPlugin({
@@ -31,9 +49,7 @@ module.exports = {
     rules: [
       {
         test: /\.(tsx|ts)?$/,
-        include: [
-          path.resolve(__dirname, 'src')
-        ],
+        include: [path.resolve(__dirname, 'src')],
         use: [
           {
             loader: 'ts-loader',
@@ -58,7 +74,7 @@ module.exports = {
       },
       {
         test: /\.svg$/,
-        include: input => input.indexOf('background-filter.svg') > 1,
+        include: (input) => input.indexOf('background-filter.svg') > 1,
         use: [
           {
             loader: 'url-loader',
@@ -72,7 +88,7 @@ module.exports = {
       },
       {
         test: /\.svg$/,
-        include: input => input.indexOf(BG_IMAGES_DIRNAME) > -1,
+        include: (input) => input.indexOf(BG_IMAGES_DIRNAME) > -1,
         use: {
           loader: 'svg-url-loader',
           options: {}
@@ -118,4 +134,4 @@ module.exports = {
     ],
     cacheWithContext: false
   }
-};
\ No newline at end of file
+};
diff --git a/ui-packages/packages/management-console-webapp/webpack.dev.js b/ui-packages/packages/management-console-webapp/webpack.dev.js
index 4f1a450df6..687b96071a 100755
--- a/ui-packages/packages/management-console-webapp/webpack.dev.js
+++ b/ui-packages/packages/management-console-webapp/webpack.dev.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
@@ -7,7 +25,8 @@ const HOST = process.env.HOST || 'localhost';
 const PORT = process.env.PORT || '9000';
 
 module.exports = function (env) {
-  const dataIndexURL = env?.KOGITO_DATAINDEX_HTTP_URL ?? 'http://localhost:4000/graphql';
+  const dataIndexURL =
+    env?.KOGITO_DATAINDEX_HTTP_URL ?? 'http://localhost:4000/graphql';
   return merge(common, {
     mode: 'development',
     devtool: 'source-map',
@@ -33,20 +52,24 @@ module.exports = function (env) {
           target: 'http://localhost:4000',
           secure: false,
           changeOrigin: true
-        },
+        }
       }
     },
-    plugins: [new webpack.EnvironmentPlugin({
-      KOGITO_ENV_MODE: 'DEV',
-      KOGITO_DATAINDEX_HTTP_URL: dataIndexURL
-    })],
+    plugins: [
+      new webpack.EnvironmentPlugin({
+        KOGITO_ENV_MODE: 'DEV',
+        KOGITO_DATAINDEX_HTTP_URL: dataIndexURL
+      })
+    ],
     module: {
       rules: [
         {
           test: /\.(css|sass|scss)$/,
-          use: [ require.resolve('style-loader'),
-          require.resolve('css-loader'),
-          require.resolve('sass-loader')]
+          use: [
+            require.resolve('style-loader'),
+            require.resolve('css-loader'),
+            require.resolve('sass-loader')
+          ]
         }
       ]
     },
@@ -58,5 +81,5 @@ module.exports = function (env) {
         path.resolve('./src')
       ]
     }
-  })
-}
\ No newline at end of file
+  });
+};
diff --git a/ui-packages/packages/management-console-webapp/webpack.it.js b/ui-packages/packages/management-console-webapp/webpack.it.js
index b0098199f6..a729a137ec 100755
--- a/ui-packages/packages/management-console-webapp/webpack.it.js
+++ b/ui-packages/packages/management-console-webapp/webpack.it.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const { merge } = require('webpack-merge');
 const common = require('./webpack.dev.js');
diff --git a/ui-packages/packages/management-console-webapp/webpack.prod.js b/ui-packages/packages/management-console-webapp/webpack.prod.js
index aa6ce9cb8a..5ef756dff7 100755
--- a/ui-packages/packages/management-console-webapp/webpack.prod.js
+++ b/ui-packages/packages/management-console-webapp/webpack.prod.js
@@ -1,9 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 
 module.exports = merge(common, {
   mode: 'production',
@@ -24,9 +42,11 @@ module.exports = merge(common, {
     rules: [
       {
         test: /\.(css|sass|scss)$/,
-        use: [ require.resolve('style-loader'),
-        require.resolve('css-loader'),
-        require.resolve('sass-loader')]
+        use: [
+          require.resolve('style-loader'),
+          require.resolve('css-loader'),
+          require.resolve('sass-loader')
+        ]
       }
     ]
   }
diff --git a/ui-packages/packages/monitoring-webapp/src/MonitoringReport.dash.yml b/ui-packages/packages/monitoring-webapp/src/MonitoringReport.dash.yml
index 7542550fb9..45ab63a271 100644
--- a/ui-packages/packages/monitoring-webapp/src/MonitoringReport.dash.yml
+++ b/ui-packages/packages/monitoring-webapp/src/MonitoringReport.dash.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 properties:
   dataIndexUrl: http://localhost:8180/graphql
   # seconds
diff --git a/ui-packages/packages/monitoring-webapp/src/WorkflowDetails.dash.yml b/ui-packages/packages/monitoring-webapp/src/WorkflowDetails.dash.yml
index 7938e80a4a..b9c62d7eef 100644
--- a/ui-packages/packages/monitoring-webapp/src/WorkflowDetails.dash.yml
+++ b/ui-packages/packages/monitoring-webapp/src/WorkflowDetails.dash.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 properties:
   dataIndexUrl: http://localhost:8180/graphql
   # charts size
diff --git a/ui-packages/packages/monitoring-webapp/src/setup.js b/ui-packages/packages/monitoring-webapp/src/setup.js
index ee258b19f6..e739aa46cf 100644
--- a/ui-packages/packages/monitoring-webapp/src/setup.js
+++ b/ui-packages/packages/monitoring-webapp/src/setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 dashbuilder = {
   /*
     // possible modes are EDITOR and CLIENT - if dashboards is set then CLIENT mode is assumed
@@ -13,5 +31,5 @@ dashbuilder = {
 	hideNavBar: true
 */
   hideNavBar: true,
-  dashboards: ["MonitoringReport.dash.yml", "WorkflowDetails.dash.yml"],
+  dashboards: ['MonitoringReport.dash.yml', 'WorkflowDetails.dash.yml']
 };
diff --git a/ui-packages/packages/monitoring/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/monitoring/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/monitoring/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/monitoring/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/monitoring/config/Jest-config/fileMocks.js b/ui-packages/packages/monitoring/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/monitoring/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/monitoring/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/monitoring/config/Jest-config/global-setup.js b/ui-packages/packages/monitoring/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/monitoring/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/monitoring/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/monitoring/config/Jest-config/styleMocks.js b/ui-packages/packages/monitoring/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/monitoring/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/monitoring/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/monitoring/config/Jest-config/test-setup.js b/ui-packages/packages/monitoring/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/monitoring/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/monitoring/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/monitoring/config/Jest-config/test-shim.js b/ui-packages/packages/monitoring/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/monitoring/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/monitoring/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/monitoring/jest.config.js b/ui-packages/packages/monitoring/jest.config.js
index dfcc22c562..885c8240ab 100644
--- a/ui-packages/packages/monitoring/jest.config.js
+++ b/ui-packages/packages/monitoring/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/monitoring/src/Dashboard.ts b/ui-packages/packages/monitoring/src/Dashboard.ts
index 37b3ff0327..c1afe94940 100644
--- a/ui-packages/packages/monitoring/src/Dashboard.ts
+++ b/ui-packages/packages/monitoring/src/Dashboard.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 export enum Dashboard {
   MONITORING = 'MonitoringReport.dash.yml',
diff --git a/ui-packages/packages/monitoring/src/MonitoringView.tsx b/ui-packages/packages/monitoring/src/MonitoringView.tsx
index d551f46cc1..d90f85f2b3 100644
--- a/ui-packages/packages/monitoring/src/MonitoringView.tsx
+++ b/ui-packages/packages/monitoring/src/MonitoringView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import MonitoringWebapp from './components/MonitoringWebapp/MonitoringWebapp';
 import '@patternfly/patternfly/patternfly.css';
diff --git a/ui-packages/packages/monitoring/src/components/MonitoringWebapp/MonitoringWebapp.tsx b/ui-packages/packages/monitoring/src/components/MonitoringWebapp/MonitoringWebapp.tsx
index c34d55abb8..a7c4256020 100644
--- a/ui-packages/packages/monitoring/src/components/MonitoringWebapp/MonitoringWebapp.tsx
+++ b/ui-packages/packages/monitoring/src/components/MonitoringWebapp/MonitoringWebapp.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const DATA_INDEX_URL_PARAM = 'dataIndexUrl';
diff --git a/ui-packages/packages/monitoring/src/components/MonitoringWebapp/tests/MonitoringWebapp.test.tsx b/ui-packages/packages/monitoring/src/components/MonitoringWebapp/tests/MonitoringWebapp.test.tsx
index 647d2153b5..e6bca5e0f4 100644
--- a/ui-packages/packages/monitoring/src/components/MonitoringWebapp/tests/MonitoringWebapp.test.tsx
+++ b/ui-packages/packages/monitoring/src/components/MonitoringWebapp/tests/MonitoringWebapp.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import MonitoringWebapp from '../MonitoringWebapp';
diff --git a/ui-packages/packages/monitoring/src/index.ts b/ui-packages/packages/monitoring/src/index.ts
index 0af5cc8edc..c5e405435d 100644
--- a/ui-packages/packages/monitoring/src/index.ts
+++ b/ui-packages/packages/monitoring/src/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './MonitoringView';
 export * from './Dashboard';
diff --git a/ui-packages/packages/ouia-tools/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/ouia-tools/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/ouia-tools/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/ouia-tools/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/ouia-tools/config/Jest-config/fileMocks.js b/ui-packages/packages/ouia-tools/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/ouia-tools/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/ouia-tools/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/ouia-tools/config/Jest-config/global-setup.js b/ui-packages/packages/ouia-tools/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/ouia-tools/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/ouia-tools/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/ouia-tools/config/Jest-config/styleMocks.js b/ui-packages/packages/ouia-tools/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/ouia-tools/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/ouia-tools/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/ouia-tools/config/Jest-config/test-setup.js b/ui-packages/packages/ouia-tools/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/ouia-tools/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/ouia-tools/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/ouia-tools/config/Jest-config/test-shim.js b/ui-packages/packages/ouia-tools/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/ouia-tools/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/ouia-tools/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/ouia-tools/jest.config.js b/ui-packages/packages/ouia-tools/jest.config.js
index 899adf0019..4a531ae62c 100644
--- a/ui-packages/packages/ouia-tools/jest.config.js
+++ b/ui-packages/packages/ouia-tools/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/ouia-tools/src/index.ts b/ui-packages/packages/ouia-tools/src/index.ts
index 9c2524f0e5..2effc560fd 100644
--- a/ui-packages/packages/ouia-tools/src/index.ts
+++ b/ui-packages/packages/ouia-tools/src/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './utils/OuiaUtils';
diff --git a/ui-packages/packages/ouia-tools/src/utils/OuiaUtils.ts b/ui-packages/packages/ouia-tools/src/utils/OuiaUtils.ts
index dcfa4c7388..f05d8c4edc 100644
--- a/ui-packages/packages/ouia-tools/src/utils/OuiaUtils.ts
+++ b/ui-packages/packages/ouia-tools/src/utils/OuiaUtils.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /**
  * Function to set OUIA:Page Page Type and Page Object Id attributes in page body.
  * @param ouiaContext OUIAContext of the component wrapped with patternfly's withOuiaContext function.
diff --git a/ui-packages/packages/ouia-tools/src/utils/tests/OuiaUtils.test.tsx b/ui-packages/packages/ouia-tools/src/utils/tests/OuiaUtils.test.tsx
index 1bf3e67bd2..076074eba6 100644
--- a/ui-packages/packages/ouia-tools/src/utils/tests/OuiaUtils.test.tsx
+++ b/ui-packages/packages/ouia-tools/src/utils/tests/OuiaUtils.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect } from 'react';
 import { render } from '@testing-library/react';
 import {
diff --git a/ui-packages/packages/process-definition-list/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/process-definition-list/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/process-definition-list/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/process-definition-list/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/process-definition-list/config/Jest-config/fileMocks.js b/ui-packages/packages/process-definition-list/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/process-definition-list/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/process-definition-list/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/process-definition-list/config/Jest-config/global-setup.js b/ui-packages/packages/process-definition-list/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/process-definition-list/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/process-definition-list/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/process-definition-list/config/Jest-config/styleMocks.js b/ui-packages/packages/process-definition-list/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/process-definition-list/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/process-definition-list/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/process-definition-list/config/Jest-config/test-setup.js b/ui-packages/packages/process-definition-list/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/process-definition-list/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/process-definition-list/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/process-definition-list/config/Jest-config/test-shim.js b/ui-packages/packages/process-definition-list/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/process-definition-list/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/process-definition-list/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/process-definition-list/jest.config.js b/ui-packages/packages/process-definition-list/jest.config.js
index 94bcf7c2ea..a9624b34c0 100644
--- a/ui-packages/packages/process-definition-list/jest.config.js
+++ b/ui-packages/packages/process-definition-list/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/process-definition-list/package.json b/ui-packages/packages/process-definition-list/package.json
index 66a75b775b..761fe84063 100644
--- a/ui-packages/packages/process-definition-list/package.json
+++ b/ui-packages/packages/process-definition-list/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
     "@patternfly/react-core": "^4.276.8",
diff --git a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListApi.ts b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListApi.ts
index f71c3aaae6..f24f64fcd6 100644
--- a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListApi.ts
+++ b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface ProcessDefinitionListApi {
   // process definition list api
 }
diff --git a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListChannelApi.ts b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListChannelApi.ts
index 80dc495945..7d2328f039 100644
--- a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListChannelApi.ts
+++ b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition } from './ProcessDefinitionListEnvelopeApi';
 
 /**
diff --git a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListDriver.ts b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListDriver.ts
index 1b78920ae0..0cbf7e6110 100644
--- a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListDriver.ts
+++ b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition } from './ProcessDefinitionListEnvelopeApi';
 
 /**
diff --git a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListEnvelopeApi.ts b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListEnvelopeApi.ts
index fff2b04c36..a41f4a2191 100644
--- a/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListEnvelopeApi.ts
+++ b/ui-packages/packages/process-definition-list/src/api/ProcessDefinitionListEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface ProcessDefinitionListEnvelopeApi {
   processDefinitionList__init(
     association: Association,
diff --git a/ui-packages/packages/process-definition-list/src/api/index.ts b/ui-packages/packages/process-definition-list/src/api/index.ts
index 1c493f1d62..ac2acda008 100644
--- a/ui-packages/packages/process-definition-list/src/api/index.ts
+++ b/ui-packages/packages/process-definition-list/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessDefinitionListApi';
 export * from './ProcessDefinitionListChannelApi';
 export * from './ProcessDefinitionListEnvelopeApi';
diff --git a/ui-packages/packages/process-definition-list/src/embedded/EmbeddedProcessDefinitionList.tsx b/ui-packages/packages/process-definition-list/src/embedded/EmbeddedProcessDefinitionList.tsx
index 772d9045ec..6803344b23 100644
--- a/ui-packages/packages/process-definition-list/src/embedded/EmbeddedProcessDefinitionList.tsx
+++ b/ui-packages/packages/process-definition-list/src/embedded/EmbeddedProcessDefinitionList.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
diff --git a/ui-packages/packages/process-definition-list/src/embedded/ProcessDefinitionListChannelApiImpl.ts b/ui-packages/packages/process-definition-list/src/embedded/ProcessDefinitionListChannelApiImpl.ts
index f555ab92a2..9da340ad6f 100644
--- a/ui-packages/packages/process-definition-list/src/embedded/ProcessDefinitionListChannelApiImpl.ts
+++ b/ui-packages/packages/process-definition-list/src/embedded/ProcessDefinitionListChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ProcessDefinition,
   ProcessDefinitionListChannelApi,
diff --git a/ui-packages/packages/process-definition-list/src/embedded/__mocks__/EmbeddedProcessDefinitionTable.tsx b/ui-packages/packages/process-definition-list/src/embedded/__mocks__/EmbeddedProcessDefinitionTable.tsx
index 8193eb4cb5..c8fc04402b 100644
--- a/ui-packages/packages/process-definition-list/src/embedded/__mocks__/EmbeddedProcessDefinitionTable.tsx
+++ b/ui-packages/packages/process-definition-list/src/embedded/__mocks__/EmbeddedProcessDefinitionTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedEmbeddedProcessDefinitionList = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-definition-list/src/embedded/index.ts b/ui-packages/packages/process-definition-list/src/embedded/index.ts
index feae90f889..f4f93d1366 100644
--- a/ui-packages/packages/process-definition-list/src/embedded/index.ts
+++ b/ui-packages/packages/process-definition-list/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedProcessDefinitionList';
diff --git a/ui-packages/packages/process-definition-list/src/embedded/tests/EmbeddedProcessDefinitionList.test.tsx b/ui-packages/packages/process-definition-list/src/embedded/tests/EmbeddedProcessDefinitionList.test.tsx
index 543ecb2990..6e4787abaa 100644
--- a/ui-packages/packages/process-definition-list/src/embedded/tests/EmbeddedProcessDefinitionList.test.tsx
+++ b/ui-packages/packages/process-definition-list/src/embedded/tests/EmbeddedProcessDefinitionList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedProcessDefinitionList } from '../EmbeddedProcessDefinitionList';
 import { MockedProcessDefinitionListDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/process-definition-list/src/embedded/tests/ProcessDefinitionListChannelApiImpl.test.tsx b/ui-packages/packages/process-definition-list/src/embedded/tests/ProcessDefinitionListChannelApiImpl.test.tsx
index ba9de853e1..b38d3f502f 100755
--- a/ui-packages/packages/process-definition-list/src/embedded/tests/ProcessDefinitionListChannelApiImpl.test.tsx
+++ b/ui-packages/packages/process-definition-list/src/embedded/tests/ProcessDefinitionListChannelApiImpl.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { ProcessDefinitionListDriver } from '../../api';
 import { ProcessDefinitionListChannelApiImpl } from '../ProcessDefinitionListChannelApiImpl';
diff --git a/ui-packages/packages/process-definition-list/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/process-definition-list/src/embedded/tests/utils/Mocks.ts
index 25e792bbfb..5139465362 100755
--- a/ui-packages/packages/process-definition-list/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/process-definition-list/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinitionListDriver } from '../../../api';
 
 export const MockedProcessDefinitionListDriver = jest.fn<
diff --git a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelope.tsx b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelope.tsx
index 0b488a15db..47e81ebf8c 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelope.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeApiImpl.ts b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeApiImpl.ts
index 667e2e2eae..a7fb201dde 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeApiImpl.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { ProcessDefinitionListEnvelopeViewApi } from './ProcessDefinitionListEnvelopeView';
 import {
diff --git a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeContext.ts b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeContext.ts
index 604b903d64..80cf20a219 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeContext.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeView.tsx b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeView.tsx
index 86c8100115..3976e83527 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeView.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
diff --git a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeViewDriver.ts b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeViewDriver.ts
index 908bbced2d..bda5b95ae0 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeViewDriver.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/ProcessDefinitionListEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   ProcessDefinition,
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/ProcessDefinitionList.tsx b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/ProcessDefinitionList.tsx
index 4e9112b90a..2eb7dac9a7 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/ProcessDefinitionList.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/ProcessDefinitionList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback, useEffect, useState } from 'react';
 import { ServerErrors } from '@kogito-apps/components-common/dist/components/ServerErrors';
 import {
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/__mocks__/ProcessDefinitionList.tsx b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/__mocks__/ProcessDefinitionList.tsx
index 09d78be96b..110c1916b6 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/__mocks__/ProcessDefinitionList.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/__mocks__/ProcessDefinitionList.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/tests/ProcessDefinitionList.test.tsx b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/tests/ProcessDefinitionList.test.tsx
index ee7cdfd99c..08f89338cf 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/tests/ProcessDefinitionList.test.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionList/tests/ProcessDefinitionList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import ProcessDefinitionList from '../ProcessDefinitionList';
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/ProcessDefinitionListToolbar.tsx b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/ProcessDefinitionListToolbar.tsx
index 61ec49064b..4ab89af6b5 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/ProcessDefinitionListToolbar.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/ProcessDefinitionListToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   ToolbarFilter,
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/__mocks__/ProcessDefinitionListToolbar.tsx b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/__mocks__/ProcessDefinitionListToolbar.tsx
index 4e2b46c0c7..ac37a651c5 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/__mocks__/ProcessDefinitionListToolbar.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/__mocks__/ProcessDefinitionListToolbar.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/tests/ProcessDefinitionListToolbar.test.tsx b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/tests/ProcessDefinitionListToolbar.test.tsx
index ec1e52c114..2e1f7c041f 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/tests/ProcessDefinitionListToolbar.test.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/ProcessDefinitionListToolbar/tests/ProcessDefinitionListToolbar.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import ProcessDefinitionListToolbar from '../ProcessDefinitionListToolbar';
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/utils/ProcessDefinitionListUtils.tsx b/ui-packages/packages/process-definition-list/src/envelope/components/utils/ProcessDefinitionListUtils.tsx
index 7997190bd2..6db7781130 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/utils/ProcessDefinitionListUtils.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/utils/ProcessDefinitionListUtils.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { DataTableColumn } from '@kogito-apps/components-common/dist/components/DataTable';
 import { PlayIcon } from '@patternfly/react-icons/dist/js/icons/play-icon';
diff --git a/ui-packages/packages/process-definition-list/src/envelope/components/utils/tests/ProcessDefinitionListUtils.test.ts b/ui-packages/packages/process-definition-list/src/envelope/components/utils/tests/ProcessDefinitionListUtils.test.ts
index 86109fb9f4..eda2d1670b 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/components/utils/tests/ProcessDefinitionListUtils.test.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/components/utils/tests/ProcessDefinitionListUtils.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { getColumn, getActionColumn } from '../ProcessDefinitionListUtils';
 
 describe('Utils tests', () => {
diff --git a/ui-packages/packages/process-definition-list/src/envelope/index.ts b/ui-packages/packages/process-definition-list/src/envelope/index.ts
index 1c7e5183c3..fff190aaca 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/index.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessDefinitionListEnvelope';
diff --git a/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeApiImpl.test.tsx b/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeApiImpl.test.tsx
index 5a6c5ce342..629562fc64 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeApiImpl.test.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeApiImpl.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedProcessDefinitionListEnvelopeViewApi
diff --git a/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeView.test.tsx b/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeView.test.tsx
index 7091b59584..426e06574f 100644
--- a/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeView.test.tsx
+++ b/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeViewDriver.test.ts b/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeViewDriver.test.ts
index dba0ccba3f..9ff7b5e11e 100755
--- a/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/tests/ProcessDefinitionListEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/MockedProcessDefinitionListDriver.ts b/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/MockedProcessDefinitionListDriver.ts
index dce71a37da..2a19a68ec7 100755
--- a/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/MockedProcessDefinitionListDriver.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/MockedProcessDefinitionListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition, ProcessDefinitionListDriver } from '../../../api';
 
 export class MockedProcessDefinitionListDriver
diff --git a/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/Mocks.ts
index 8991631c95..c6783eafc1 100755
--- a/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-definition-list/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ApiNotificationConsumers,
   MessageBusClientApi,
diff --git a/ui-packages/packages/process-definition-list/src/index.ts b/ui-packages/packages/process-definition-list/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/process-definition-list/src/index.ts
+++ b/ui-packages/packages/process-definition-list/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/process-details/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/process-details/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/process-details/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/process-details/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/process-details/config/Jest-config/fileMocks.js b/ui-packages/packages/process-details/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/process-details/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/process-details/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/process-details/config/Jest-config/global-setup.js b/ui-packages/packages/process-details/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/process-details/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/process-details/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/process-details/config/Jest-config/styleMocks.js b/ui-packages/packages/process-details/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/process-details/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/process-details/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/process-details/config/Jest-config/test-setup.js b/ui-packages/packages/process-details/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/process-details/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/process-details/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/process-details/config/Jest-config/test-shim.js b/ui-packages/packages/process-details/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/process-details/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/process-details/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/process-details/jest.config.js b/ui-packages/packages/process-details/jest.config.js
index a69e62f547..865490424d 100644
--- a/ui-packages/packages/process-details/jest.config.js
+++ b/ui-packages/packages/process-details/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/process-details/package.json b/ui-packages/packages/process-details/package.json
index ae17c99c4d..a18d90e14c 100644
--- a/ui-packages/packages/process-details/package.json
+++ b/ui-packages/packages/process-details/package.json
@@ -28,11 +28,11 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/editor": "0.30.0",
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
-    "@kie-tools/serverless-workflow-combined-editor": "0.30.0",
-    "@kie-tools/serverless-workflow-diagram-editor-assets": "0.30.0",
+    "@kie-tools-core/editor": "0.32.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
+    "@kie-tools/serverless-workflow-combined-editor": "0.32.0",
+    "@kie-tools/serverless-workflow-diagram-editor-assets": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/management-console-shared": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
diff --git a/ui-packages/packages/process-details/src/api/ProcessDetailsApi.ts b/ui-packages/packages/process-details/src/api/ProcessDetailsApi.ts
index 46ea09c0e1..1b591a505f 100644
--- a/ui-packages/packages/process-details/src/api/ProcessDetailsApi.ts
+++ b/ui-packages/packages/process-details/src/api/ProcessDetailsApi.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 // eslint-disable-next-line  @typescript-eslint/no-empty-interface
 export interface ProcessDetailsApi {}
diff --git a/ui-packages/packages/process-details/src/api/ProcessDetailsChannelApi.ts b/ui-packages/packages/process-details/src/api/ProcessDetailsChannelApi.ts
index ef60c0e23a..0df7cc7bbb 100644
--- a/ui-packages/packages/process-details/src/api/ProcessDetailsChannelApi.ts
+++ b/ui-packages/packages/process-details/src/api/ProcessDetailsChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ProcessInstance,
   Job,
diff --git a/ui-packages/packages/process-details/src/api/ProcessDetailsDriver.ts b/ui-packages/packages/process-details/src/api/ProcessDetailsDriver.ts
index 2e157d8886..f36f9e66f4 100644
--- a/ui-packages/packages/process-details/src/api/ProcessDetailsDriver.ts
+++ b/ui-packages/packages/process-details/src/api/ProcessDetailsDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ProcessInstance,
   Job,
diff --git a/ui-packages/packages/process-details/src/api/ProcessDetailsEnvelopeApi.ts b/ui-packages/packages/process-details/src/api/ProcessDetailsEnvelopeApi.ts
index 13f2c3e2bd..cd49e0a359 100644
--- a/ui-packages/packages/process-details/src/api/ProcessDetailsEnvelopeApi.ts
+++ b/ui-packages/packages/process-details/src/api/ProcessDetailsEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessInstance } from '@kogito-apps/management-console-shared/dist/types';
 
 export interface ProcessDetailsEnvelopeApi {
@@ -38,7 +40,6 @@ export interface ProcessDetailsInitArgs {
   omittedProcessTimelineEvents?: string[];
   diagramPreviewSize?: DiagramPreviewSize;
   showSwfDiagram: boolean;
-  isStunnerEnabled?: boolean;
   singularProcessLabel: string;
   pluralProcessLabel: string;
 }
diff --git a/ui-packages/packages/process-details/src/api/index.ts b/ui-packages/packages/process-details/src/api/index.ts
index 537ab8cf7a..3d9af21a21 100644
--- a/ui-packages/packages/process-details/src/api/index.ts
+++ b/ui-packages/packages/process-details/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessDetailsApi';
 export * from './ProcessDetailsEnvelopeApi';
 export * from './ProcessDetailsChannelApi';
diff --git a/ui-packages/packages/process-details/src/embedded/EmbeddedProcessDetails.tsx b/ui-packages/packages/process-details/src/embedded/EmbeddedProcessDetails.tsx
index 1a8af870e4..36f9c0bffb 100644
--- a/ui-packages/packages/process-details/src/embedded/EmbeddedProcessDetails.tsx
+++ b/ui-packages/packages/process-details/src/embedded/EmbeddedProcessDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
@@ -39,7 +41,6 @@ export interface Props {
   omittedProcessTimelineEvents?: string[];
   diagramPreviewSize?: DiagramPreviewSize;
   showSwfDiagram: boolean;
-  isStunnerEnabled?: boolean;
   singularProcessLabel: string;
   pluralProcessLabel: string;
 }
@@ -87,7 +88,6 @@ export const EmbeddedProcessDetails = React.forwardRef(
             omittedProcessTimelineEvents: props.omittedProcessTimelineEvents,
             diagramPreviewSize: props.diagramPreviewSize,
             showSwfDiagram: props.showSwfDiagram,
-            isStunnerEnabled: props.isStunnerEnabled,
             singularProcessLabel: props.singularProcessLabel,
             pluralProcessLabel: props.pluralProcessLabel
           }
diff --git a/ui-packages/packages/process-details/src/embedded/ProcessDetailsChannelApiImpl.ts b/ui-packages/packages/process-details/src/embedded/ProcessDetailsChannelApiImpl.ts
index 699176879f..ea6220807d 100644
--- a/ui-packages/packages/process-details/src/embedded/ProcessDetailsChannelApiImpl.ts
+++ b/ui-packages/packages/process-details/src/embedded/ProcessDetailsChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDetailsChannelApi, ProcessDetailsDriver } from '../api';
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/process-details/src/embedded/index.ts b/ui-packages/packages/process-details/src/embedded/index.ts
index 2e308e915e..c9d2f88447 100644
--- a/ui-packages/packages/process-details/src/embedded/index.ts
+++ b/ui-packages/packages/process-details/src/embedded/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedProcessDetails';
 export * from './ProcessDetailsChannelApiImpl';
diff --git a/ui-packages/packages/process-details/src/embedded/tests/EmbeddedProcessDetails.test.tsx b/ui-packages/packages/process-details/src/embedded/tests/EmbeddedProcessDetails.test.tsx
index c292b0ae44..26fa09f636 100644
--- a/ui-packages/packages/process-details/src/embedded/tests/EmbeddedProcessDetails.test.tsx
+++ b/ui-packages/packages/process-details/src/embedded/tests/EmbeddedProcessDetails.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedProcessDetails } from '../EmbeddedProcessDetails';
 import { MockedProcessDetailsDriver } from './mocks/Mocks';
diff --git a/ui-packages/packages/process-details/src/embedded/tests/ProcessDetailsChannelApiImpl.test.ts b/ui-packages/packages/process-details/src/embedded/tests/ProcessDetailsChannelApiImpl.test.ts
index ee437b970e..9903896200 100644
--- a/ui-packages/packages/process-details/src/embedded/tests/ProcessDetailsChannelApiImpl.test.ts
+++ b/ui-packages/packages/process-details/src/embedded/tests/ProcessDetailsChannelApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Job,
   JobStatus,
diff --git a/ui-packages/packages/process-details/src/embedded/tests/mocks/Mocks.ts b/ui-packages/packages/process-details/src/embedded/tests/mocks/Mocks.ts
index 607e50b1cc..fbb1cbc7b5 100644
--- a/ui-packages/packages/process-details/src/embedded/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-details/src/embedded/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDetailsDriver } from '../../../api';
 
 export const MockedProcessDetailsDriver = jest.fn<ProcessDetailsDriver, []>(
diff --git a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelope.tsx b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelope.tsx
index bb23ae7a40..d258b33bf1 100644
--- a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelope.tsx
+++ b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeApiImpl.ts b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeApiImpl.ts
index 2dd8660f13..2a7983d947 100644
--- a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeApiImpl.ts
+++ b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { ProcessDetailsEnvelopeViewApi } from './ProcessDetailsEnvelopeView';
 import {
diff --git a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeContext.ts b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeContext.ts
index f968995947..c046e4e697 100644
--- a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeContext.ts
+++ b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  * Since the Process details View is very simple, it's empty.
diff --git a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeView.tsx b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeView.tsx
index 12a8990b94..9ded3821af 100644
--- a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeView.tsx
+++ b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
@@ -49,7 +51,6 @@ export const ProcessDetailsEnvelopeView = React.forwardRef<
   const [diagramPreviewSize, setDiagramPreviewSize] =
     useState<DiagramPreviewSize>();
   const [showSwfDiagram, setShowSwfDiagram] = useState<boolean>(false);
-  const [isStunnerEnabled, setIsStunnerEnabled] = useState<boolean>(false);
   const [singularProcessLabel, setSingularProcessLabel] = useState<string>('');
   const [pluralProcessLabel, setPluralProcessLabel] = useState<string>('');
   useImperativeHandle(
@@ -60,7 +61,6 @@ export const ProcessDetailsEnvelopeView = React.forwardRef<
         setOmittedProcessTimelineEvents(initArgs.omittedProcessTimelineEvents);
         setDiagramPreviewSize(initArgs.diagramPreviewSize);
         setShowSwfDiagram(initArgs.showSwfDiagram);
-        setIsStunnerEnabled(initArgs.isStunnerEnabled);
         setSingularProcessLabel(initArgs.singularProcessLabel);
         setPluralProcessLabel(initArgs.pluralProcessLabel);
         setEnvelopeConnectedToChannel(true);
@@ -78,7 +78,6 @@ export const ProcessDetailsEnvelopeView = React.forwardRef<
         omittedProcessTimelineEvents={omittedProcessTimelineEvents}
         diagramPreviewSize={diagramPreviewSize}
         showSwfDiagram={showSwfDiagram}
-        isStunnerEnabled={isStunnerEnabled}
         singularProcessLabel={singularProcessLabel}
         pluralProcessLabel={pluralProcessLabel}
       />
diff --git a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeViewDriver.ts b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeViewDriver.ts
index 7e18532e34..e2499e77ba 100644
--- a/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeViewDriver.ts
+++ b/ui-packages/packages/process-details/src/envelope/ProcessDetailsEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { ProcessDetailsChannelApi, ProcessDetailsDriver } from '../api';
 import {
diff --git a/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/JobActionsKebab.tsx b/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/JobActionsKebab.tsx
index c7b34fce5e..2ad90cb665 100644
--- a/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/JobActionsKebab.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/JobActionsKebab.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   DropdownItem,
diff --git a/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/__mocks__/JobActionsKebab.tsx b/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/__mocks__/JobActionsKebab.tsx
index 25015f5bf9..96fcf50b5e 100644
--- a/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/__mocks__/JobActionsKebab.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/__mocks__/JobActionsKebab.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedJobActionsKebab = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/tests/JobsActionsKebab.test.tsx b/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/tests/JobsActionsKebab.test.tsx
index 5843bc6ae4..6ea49e3069 100644
--- a/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/tests/JobsActionsKebab.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/JobActionsKebab/tests/JobsActionsKebab.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import JobActionsKebab from '../JobActionsKebab';
 import { fireEvent, render, waitFor, screen } from '@testing-library/react';
diff --git a/ui-packages/packages/process-details/src/envelope/components/JobsPanel/JobsPanel.tsx b/ui-packages/packages/process-details/src/envelope/components/JobsPanel/JobsPanel.tsx
index ac0fdc79e5..499302f06c 100644
--- a/ui-packages/packages/process-details/src/envelope/components/JobsPanel/JobsPanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/JobsPanel/JobsPanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState, useEffect } from 'react';
 import {
   Card,
diff --git a/ui-packages/packages/process-details/src/envelope/components/JobsPanel/__mocks__/JobsPanel.tsx b/ui-packages/packages/process-details/src/envelope/components/JobsPanel/__mocks__/JobsPanel.tsx
index bf24fb8512..6410d2e96b 100644
--- a/ui-packages/packages/process-details/src/envelope/components/JobsPanel/__mocks__/JobsPanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/JobsPanel/__mocks__/JobsPanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedJobsPanel = () => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/JobsPanel/tests/JobsPanel.test.tsx b/ui-packages/packages/process-details/src/envelope/components/JobsPanel/tests/JobsPanel.test.tsx
index 7224a9d8f9..dd10adb2e9 100644
--- a/ui-packages/packages/process-details/src/envelope/components/JobsPanel/tests/JobsPanel.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/JobsPanel/tests/JobsPanel.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import JobsPanel from '../JobsPanel';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/ProcessDetails.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/ProcessDetails.tsx
index f40f67f0c8..769dae7ed7 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/ProcessDetails.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/ProcessDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core/dist/js/layouts/Flex';
 import { Grid, GridItem } from '@patternfly/react-core/dist/js/layouts/Grid';
@@ -69,7 +71,6 @@ interface ProcessDetailsProps {
   omittedProcessTimelineEvents: string[];
   diagramPreviewSize?: DiagramPreviewSize;
   showSwfDiagram: boolean;
-  isStunnerEnabled?: boolean;
   singularProcessLabel: string;
   pluralProcessLabel: string;
 }
@@ -84,8 +85,7 @@ const ProcessDetails: React.FC<ProcessDetailsProps> = ({
   diagramPreviewSize,
   showSwfDiagram,
   singularProcessLabel,
-  pluralProcessLabel,
-  isStunnerEnabled
+  pluralProcessLabel
 }) => {
   const [data, setData] = useState<ProcessInstance>({} as ProcessInstance);
   const [jobs, setJobs] = useState<Job[]>([]);
@@ -322,7 +322,6 @@ const ProcessDetails: React.FC<ProcessDetailsProps> = ({
       <Flex>
         <FlexItem>
           <SwfCombinedEditor
-            isStunnerEnabled={isStunnerEnabled}
             height={diagramPreviewSize?.height}
             width={diagramPreviewSize?.width}
             workflowInstance={data}
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/__mocks__/ProcessDetails.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/__mocks__/ProcessDetails.tsx
index 29adbf5c1a..6c59fddc1b 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/__mocks__/ProcessDetails.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/__mocks__/ProcessDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessDetails = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/tests/ProcessDetails.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/tests/ProcessDetails.test.tsx
index 5b2eac590f..6d96d7f20a 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/tests/ProcessDetails.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetails/tests/ProcessDetails.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import ProcessDetails from '../ProcessDetails';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/ProcessDetailsErrorModal.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/ProcessDetailsErrorModal.tsx
index 4ccc14dc60..a3c59d31da 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/ProcessDetailsErrorModal.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/ProcessDetailsErrorModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   Modal,
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/__mocks__/ProcessDetailsErrorModal.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/__mocks__/ProcessDetailsErrorModal.tsx
index 04745eb33e..244ed34ba0 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/__mocks__/ProcessDetailsErrorModal.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/__mocks__/ProcessDetailsErrorModal.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessDetailsErrorModal = () => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/tests/ProcessDetailsErrorModal.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/tests/ProcessDetailsErrorModal.test.tsx
index e58857c448..3832907af1 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/tests/ProcessDetailsErrorModal.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsErrorModal/tests/ProcessDetailsErrorModal.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import ProcessDetailsErrorModal from '../ProcessDetailsErrorModal';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/ProcessDetailsMilestonesPanel.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/ProcessDetailsMilestonesPanel.tsx
index 0ce60e12a2..ec1b1eb0e2 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/ProcessDetailsMilestonesPanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/ProcessDetailsMilestonesPanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   CardBody,
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/__mocks__/ProcessDetailsMilestonesPanel.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/__mocks__/ProcessDetailsMilestonesPanel.tsx
index 1cabc4df3b..cab7be3e35 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/__mocks__/ProcessDetailsMilestonesPanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/__mocks__/ProcessDetailsMilestonesPanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const ProcessDetailsMilestonesPanel = () => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/tests/ProcessDetailsMilestonesPanel.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/tests/ProcessDetailsMilestonesPanel.test.tsx
index a9b997a5fc..6b4c5cd94f 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/tests/ProcessDetailsMilestonesPanel.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsMilestonesPanel/tests/ProcessDetailsMilestonesPanel.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import ProcessDetailsMilestonesPanel from '../ProcessDetailsMilestonesPanel';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/ProcessDetailsNodeTrigger.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/ProcessDetailsNodeTrigger.tsx
index f69e5b31b5..632f21c508 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/ProcessDetailsNodeTrigger.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/ProcessDetailsNodeTrigger.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Card,
   CardBody,
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/__mocks__/ProcessDetailsNodeTrigger.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/__mocks__/ProcessDetailsNodeTrigger.tsx
index c2c93369ce..63fe2d184a 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/__mocks__/ProcessDetailsNodeTrigger.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/__mocks__/ProcessDetailsNodeTrigger.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/tests/ProcessDetailsNodeTrigger.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/tests/ProcessDetailsNodeTrigger.test.tsx
index 5f91f4f5ce..7e64f8b926 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/tests/ProcessDetailsNodeTrigger.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsNodeTrigger/tests/ProcessDetailsNodeTrigger.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import ProcessDetailsNodeTrigger from '../ProcessDetailsNodeTrigger';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/ProcessDetailsPanel.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/ProcessDetailsPanel.tsx
index b14cab1b83..2fe37d45ee 100755
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/ProcessDetailsPanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/ProcessDetailsPanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import Moment from 'react-moment';
 import {
   Card,
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/__mocks__/ProcessDetailsPanel.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/__mocks__/ProcessDetailsPanel.tsx
index 29adbf5c1a..6c59fddc1b 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/__mocks__/ProcessDetailsPanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/__mocks__/ProcessDetailsPanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessDetails = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/tests/ProcessDetailsPanel.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/tests/ProcessDetailsPanel.test.tsx
index 0feab85f1e..47b1d2d542 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/tests/ProcessDetailsPanel.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsPanel/tests/ProcessDetailsPanel.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/ProcessDetailsTimelinePanel.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/ProcessDetailsTimelinePanel.tsx
index bfb2d76aed..1d012f2a5a 100755
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/ProcessDetailsTimelinePanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/ProcessDetailsTimelinePanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import Moment from 'react-moment';
 import {
   Dropdown,
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/ProcessDetailsTimelinePanel.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/ProcessDetailsTimelinePanel.tsx
index 3722a77ad4..8a3985e6ec 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/ProcessDetailsTimelinePanel.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/ProcessDetailsTimelinePanel.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessDetailsTimeline = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/tabbable.js b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/tabbable.js
index d86d325edc..02d3358598 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/tabbable.js
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/__mocks__/tabbable.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const lib = jest.requireActual('tabbable');
 
 const tabbable = {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/tests/ProcessDetailsTimelinePanel.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/tests/ProcessDetailsTimelinePanel.test.tsx
index b315c9b078..a88f2535e2 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/tests/ProcessDetailsTimelinePanel.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDetailsTimelinePanel/tests/ProcessDetailsTimelinePanel.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import ProcessDetailsTimelinePanel from '../ProcessDetailsTimelinePanel';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/ProcessDiagram.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/ProcessDiagram.tsx
index 537405513e..99e8e41d2e 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/ProcessDiagram.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/ProcessDiagram.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { UncontrolledReactSVGPanZoom } from 'react-svg-pan-zoom';
 import { componentOuiaProps, OUIAProps } from '@kogito-apps/ouia-tools';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/__mocks__/ProcessDiagram.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/__mocks__/ProcessDiagram.tsx
index 150aa79d15..0f9a9f85e5 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/__mocks__/ProcessDiagram.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/__mocks__/ProcessDiagram.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessDiagram = () => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/tests/ProcessDiagram.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/tests/ProcessDiagram.test.tsx
index c185fa182c..6660ba0037 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/tests/ProcessDiagram.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessDiagram/tests/ProcessDiagram.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import ProcessDiagram from '../ProcessDiagram';
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/ProcessVariables.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/ProcessVariables.tsx
index 1e61f5c455..a22f390dbb 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/ProcessVariables.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/ProcessVariables.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Card,
   CardBody,
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/__mocks__/ProcessVariables.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/__mocks__/ProcessVariables.tsx
index 800160d019..b2e3ecac1a 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/__mocks__/ProcessVariables.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/__mocks__/ProcessVariables.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessVariables = ({ setDisplayLabel }): React.ReactElement => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/tests/ProcessVariables.test.tsx b/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/tests/ProcessVariables.test.tsx
index 73348ed226..4cd1a6b5f8 100644
--- a/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/tests/ProcessVariables.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/ProcessVariables/tests/ProcessVariables.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import ProcessVariables from '../ProcessVariables';
diff --git a/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/SwfCombinedEditor.tsx b/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/SwfCombinedEditor.tsx
index 6e6b0f3721..b84e9ed3ba 100644
--- a/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/SwfCombinedEditor.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/SwfCombinedEditor.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   EmbeddedEditor,
@@ -42,9 +44,8 @@ import {
 } from '@kie-tools-core/editor/dist/channel';
 import {
   SwfCombinedEditorChannelApiImpl,
-  SwfFeatureToggleChannelApiImpl,
   SwfPreviewOptionsChannelApiImpl
-} from '@kie-tools/serverless-workflow-combined-editor/dist/impl';
+} from '@kie-tools/serverless-workflow-combined-editor/dist/channel';
 import { useController } from '../../../hooks/useController';
 import { ProcessInstance } from '@kogito-apps/management-console-shared/dist/types';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
@@ -52,14 +53,12 @@ import { ServerlessWorkflowCombinedEditorChannelApi } from '@kie-tools/serverles
 import { ServerlessWorkflowCombinedEditorEnvelopeApi } from '@kie-tools/serverless-workflow-combined-editor/dist/api/ServerlessWorkflowCombinedEditorEnvelopeApi';
 interface ISwfCombinedEditorProps {
   workflowInstance: Pick<ProcessInstance, 'source' | 'nodes' | 'error'>;
-  isStunnerEnabled: boolean;
   width?: number;
   height?: number;
 }
 
 const SwfCombinedEditor: React.FC<ISwfCombinedEditorProps & OUIAProps> = ({
   workflowInstance,
-  isStunnerEnabled,
   width,
   height,
   ouiaId,
@@ -129,14 +128,6 @@ const SwfCombinedEditor: React.FC<ISwfCombinedEditorProps & OUIAProps> = ({
     [stateControl, embeddedFile]
   );
 
-  const swfFeatureToggleChannelApiImpl = useMemo(
-    () =>
-      new SwfFeatureToggleChannelApiImpl({
-        stunnerEnabled: isStunnerEnabled
-      }),
-    [isStunnerEnabled]
-  );
-
   const swfPreviewOptionsChannelApiImpl = useMemo(
     () =>
       new SwfPreviewOptionsChannelApiImpl({
@@ -147,19 +138,11 @@ const SwfCombinedEditor: React.FC<ISwfCombinedEditorProps & OUIAProps> = ({
 
   const apiImpl = useMemo(
     () =>
-      new SwfCombinedEditorChannelApiImpl(
-        channelApiImpl,
-        swfFeatureToggleChannelApiImpl,
-        null,
-        null,
-        swfPreviewOptionsChannelApiImpl,
-        null
-      ),
-    [
-      channelApiImpl,
-      swfFeatureToggleChannelApiImpl,
-      swfPreviewOptionsChannelApiImpl
-    ]
+      new SwfCombinedEditorChannelApiImpl({
+        defaultApiImpl: channelApiImpl,
+        swfPreviewOptionsChannelApiImpl
+      }),
+    [channelApiImpl, swfPreviewOptionsChannelApiImpl]
   );
 
   useEffect(() => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/__mocks__/SwfCombinedEditor.tsx b/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/__mocks__/SwfCombinedEditor.tsx
index d29aa6d529..00f0aebf67 100644
--- a/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/__mocks__/SwfCombinedEditor.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/__mocks__/SwfCombinedEditor.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedSwfCombinedEditor = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/tests/SwfCombinedEditor.test.tsx b/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/tests/SwfCombinedEditor.test.tsx
index 3ea5e24bda..e2e6b4897c 100644
--- a/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/tests/SwfCombinedEditor.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/components/SwfCombinedEditor/tests/SwfCombinedEditor.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import SwfCombinedEditor from '../SwfCombinedEditor';
@@ -50,8 +52,7 @@ describe('SwfCombinedEditor component tests', () => {
         ]
       },
       height: 600,
-      width: 600,
-      isStunnerEnabled: true
+      width: 600
     };
     const container = render(<SwfCombinedEditor {...props} />).container;
     expect(container).toMatchSnapshot();
@@ -66,8 +67,7 @@ describe('SwfCombinedEditor component tests', () => {
         nodes: []
       },
       height: 600,
-      width: 600,
-      isStunnerEnabled: true
+      width: 600
     };
     const container = render(<SwfCombinedEditor {...props} />).container;
     expect(container).toMatchSnapshot();
diff --git a/ui-packages/packages/process-details/src/envelope/components/styles.css b/ui-packages/packages/process-details/src/envelope/components/styles.css
index a78b67c0d9..69d8423973 100644
--- a/ui-packages/packages/process-details/src/envelope/components/styles.css
+++ b/ui-packages/packages/process-details/src/envelope/components/styles.css
@@ -1,86 +1,89 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-process-details--details__title small {
-    --pf-c-content--small--Color: var(--pf-global--Color--100) !important;
+  --pf-c-content--small--Color: var(--pf-global--Color--100) !important;
 }
 .kogito-process-details--details__buttonMargin {
-    margin-right: var(--pf-global--spacer--md) !important;
+  margin-right: var(--pf-global--spacer--md) !important;
 }
 .kogito-process-details--details__marginSpaces {
-    margin-top: 20px; 
+  margin-top: 20px;
 }
 .kogito-process-details--NodeTrigger-cardHeight {
-    height: 494px;
+  height: 494px;
 }
 .kogito-process-details--variables__label-fadeOut {
-    opacity:0;
-     width:0;
-     height:0;
-     transition: width 0.5s 0.5s, height 0.5s 0.5s, opacity 0.5s;
+  opacity: 0;
+  width: 0;
+  height: 0;
+  transition: width 0.5s 0.5s, height 0.5s 0.5s, opacity 0.5s;
 }
-.kogito-process-details--variables__label-fadeIn{
-    opacity:1;
-     transition: width 0.5s, height 0.5s, opacity 0.5s 0.5s;
+.kogito-process-details--variables__label-fadeIn {
+  opacity: 1;
+  transition: width 0.5s, height 0.5s, opacity 0.5s 0.5s;
 }
 
 .kogito-process-details--milestones__nameText > blockquote {
-    padding: 0px !important;
-    border-left: 0px !important;
+  padding: 0px !important;
+  border-left: 0px !important;
 }
 
 .kogito-process-details--milestones__nameTextEllipses {
-    display:inline-block;
+  display: inline-block;
+  white-space: nowrap;
+  width: 20em;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  position: relative;
+  top: 5px;
+  word-break: break-all;
+}
+@media only screen and (max-width: 1710px) {
+  .kogito-process-details--milestones__nameTextEllipses {
+    display: inline-block;
     white-space: nowrap;
-    width: 20em;
+    width: 10em;
     overflow: hidden;
     text-overflow: ellipsis;
     position: relative;
     top: 5px;
     word-break: break-all;
-}
-@media only screen and (max-width: 1710px) {
-    .kogito-process-details--milestones__nameTextEllipses {
-        display: inline-block;
-        white-space: nowrap;
-        width: 10em;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        position: relative;
-        top: 5px;
-        word-break: break-all;
-    }
+  }
 }
 .kogito-process-details__card-size {
-    height: 100%
+  height: 100%;
 }
 /* This adds the line extending the length of the timeline, while the items are pushed left to overlap it halfway. The first child is pushed up to hide the top of the dashed line. The status icon must be given a background so that the line doesn't show through the icon. */
 .kogito-process-details--timeline {
-    border-left: var(--pf-global--BorderWidth--md) dashed var(--pf-global--BorderColor--300);
-    margin-left: var(--pf-global--spacer--sm);
-    margin-top: var(--pf-global--spacer--sm);
+  border-left: var(--pf-global--BorderWidth--md) dashed
+    var(--pf-global--BorderColor--300);
+  margin-left: var(--pf-global--spacer--sm);
+  margin-top: var(--pf-global--spacer--sm);
 }
 .kogito-process-details--timeline-item {
-    background-color: transparent;
-    margin-left: calc(-1 * var(--pf-global--spacer--sm));
+  background-color: transparent;
+  margin-left: calc(-1 * var(--pf-global--spacer--sm));
 }
 .kogito-process-details--timeline-item:first-child {
-    margin-top: calc(-1 * var(--pf-global--spacer--sm));
+  margin-top: calc(-1 * var(--pf-global--spacer--sm));
 }
 .kogito-process-details--timeline-status {
-    background-color: var(--pf-global--BackgroundColor--100);
-    margin-left: calc(-1 * var(--pf-global--spacer--sm));
+  background-color: var(--pf-global--BackgroundColor--100);
+  margin-left: calc(-1 * var(--pf-global--spacer--sm));
 }
diff --git a/ui-packages/packages/process-details/src/envelope/index.ts b/ui-packages/packages/process-details/src/envelope/index.ts
index ba57d3483a..d480a9fb2c 100644
--- a/ui-packages/packages/process-details/src/envelope/index.ts
+++ b/ui-packages/packages/process-details/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessDetailsEnvelope';
diff --git a/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeApiImpl.test.ts b/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeApiImpl.test.ts
index e99273ae99..7698703467 100644
--- a/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedProcessDetailsEnvelopeViewApi
diff --git a/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeView.test.tsx b/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeView.test.tsx
index 2b877e2915..64d3355269 100644
--- a/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeView.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import { MockedMessageBusClientApi } from './mocks/Mocks';
diff --git a/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeViewDriver.test.tsx b/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeViewDriver.test.tsx
index ec4160b7c9..5760d339a5 100644
--- a/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeViewDriver.test.tsx
+++ b/ui-packages/packages/process-details/src/envelope/tests/ProcessDetailsEnvelopeViewDriver.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/process-details/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/process-details/src/envelope/tests/mocks/Mocks.ts
index 4945bac9a4..d721b97ff4 100644
--- a/ui-packages/packages/process-details/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-details/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames,
diff --git a/ui-packages/packages/process-details/src/envelope/tests/mocks/TestProcessDetailsDriver.ts b/ui-packages/packages/process-details/src/envelope/tests/mocks/TestProcessDetailsDriver.ts
index 0c67f4fc77..e768406eb5 100644
--- a/ui-packages/packages/process-details/src/envelope/tests/mocks/TestProcessDetailsDriver.ts
+++ b/ui-packages/packages/process-details/src/envelope/tests/mocks/TestProcessDetailsDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDetailsDriver } from '../../../api';
 import {
   Job,
diff --git a/ui-packages/packages/process-details/src/hooks/useController.ts b/ui-packages/packages/process-details/src/hooks/useController.ts
index dd864fae04..159ef64cbd 100644
--- a/ui-packages/packages/process-details/src/hooks/useController.ts
+++ b/ui-packages/packages/process-details/src/hooks/useController.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { useCallback, useState } from 'react';
 
 export function useController<T>(): [T | undefined, (controller: T) => void] {
diff --git a/ui-packages/packages/process-details/src/index.ts b/ui-packages/packages/process-details/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/process-details/src/index.ts
+++ b/ui-packages/packages/process-details/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/process-details/src/utils/Utils.tsx b/ui-packages/packages/process-details/src/utils/Utils.tsx
index 9757f3bb82..37cd9cac38 100644
--- a/ui-packages/packages/process-details/src/utils/Utils.tsx
+++ b/ui-packages/packages/process-details/src/utils/Utils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   JobStatus,
diff --git a/ui-packages/packages/process-details/src/utils/tests/utils.test.tsx b/ui-packages/packages/process-details/src/utils/tests/utils.test.tsx
index c589d4f5bc..81065d9620 100644
--- a/ui-packages/packages/process-details/src/utils/tests/utils.test.tsx
+++ b/ui-packages/packages/process-details/src/utils/tests/utils.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Job,
   JobCancel,
diff --git a/ui-packages/packages/process-form/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/process-form/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/process-form/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/process-form/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/process-form/config/Jest-config/fileMocks.js b/ui-packages/packages/process-form/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/process-form/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/process-form/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/process-form/config/Jest-config/global-setup.js b/ui-packages/packages/process-form/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/process-form/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/process-form/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/process-form/config/Jest-config/styleMocks.js b/ui-packages/packages/process-form/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/process-form/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/process-form/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/process-form/config/Jest-config/test-setup.js b/ui-packages/packages/process-form/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/process-form/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/process-form/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/process-form/config/Jest-config/test-shim.js b/ui-packages/packages/process-form/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/process-form/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/process-form/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/process-form/package.json b/ui-packages/packages/process-form/package.json
index 25f24fc303..2b54024351 100644
--- a/ui-packages/packages/process-form/package.json
+++ b/ui-packages/packages/process-form/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/task-console-shared": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
diff --git a/ui-packages/packages/process-form/src/api/ProcessFormApi.ts b/ui-packages/packages/process-form/src/api/ProcessFormApi.ts
index d59af0d21b..d8966dbbf4 100644
--- a/ui-packages/packages/process-form/src/api/ProcessFormApi.ts
+++ b/ui-packages/packages/process-form/src/api/ProcessFormApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface ProcessFormApi {}
diff --git a/ui-packages/packages/process-form/src/api/ProcessFormChannelApi.ts b/ui-packages/packages/process-form/src/api/ProcessFormChannelApi.ts
index 65c8905c42..914d2dad32 100644
--- a/ui-packages/packages/process-form/src/api/ProcessFormChannelApi.ts
+++ b/ui-packages/packages/process-form/src/api/ProcessFormChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition } from './ProcessFormEnvelopeApi';
 
 export interface ProcessFormChannelApi {
diff --git a/ui-packages/packages/process-form/src/api/ProcessFormDriver.ts b/ui-packages/packages/process-form/src/api/ProcessFormDriver.ts
index 37b74be815..d4189e9581 100644
--- a/ui-packages/packages/process-form/src/api/ProcessFormDriver.ts
+++ b/ui-packages/packages/process-form/src/api/ProcessFormDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition } from './ProcessFormEnvelopeApi';
 
 /**
diff --git a/ui-packages/packages/process-form/src/api/ProcessFormEnvelopeApi.ts b/ui-packages/packages/process-form/src/api/ProcessFormEnvelopeApi.ts
index b9a3e8b1ba..1cbade4e8d 100644
--- a/ui-packages/packages/process-form/src/api/ProcessFormEnvelopeApi.ts
+++ b/ui-packages/packages/process-form/src/api/ProcessFormEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface ProcessFormEnvelopeApi {
   processForm__init(
     association: Association,
diff --git a/ui-packages/packages/process-form/src/api/index.ts b/ui-packages/packages/process-form/src/api/index.ts
index c00f9c8df3..8bcbd56426 100644
--- a/ui-packages/packages/process-form/src/api/index.ts
+++ b/ui-packages/packages/process-form/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessFormApi';
 export * from './ProcessFormChannelApi';
 export * from './ProcessFormEnvelopeApi';
diff --git a/ui-packages/packages/process-form/src/embedded/EmbeddedProcessForm.tsx b/ui-packages/packages/process-form/src/embedded/EmbeddedProcessForm.tsx
index b3e08b031f..cf838f23bf 100644
--- a/ui-packages/packages/process-form/src/embedded/EmbeddedProcessForm.tsx
+++ b/ui-packages/packages/process-form/src/embedded/EmbeddedProcessForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
diff --git a/ui-packages/packages/process-form/src/embedded/EmbeddedProcessFormChannelApiImpl.ts b/ui-packages/packages/process-form/src/embedded/EmbeddedProcessFormChannelApiImpl.ts
index c8fb3993e0..011b634518 100644
--- a/ui-packages/packages/process-form/src/embedded/EmbeddedProcessFormChannelApiImpl.ts
+++ b/ui-packages/packages/process-form/src/embedded/EmbeddedProcessFormChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ProcessDefinition,
   ProcessFormChannelApi,
diff --git a/ui-packages/packages/process-form/src/embedded/index.ts b/ui-packages/packages/process-form/src/embedded/index.ts
index 731f483b6d..4d6d392227 100644
--- a/ui-packages/packages/process-form/src/embedded/index.ts
+++ b/ui-packages/packages/process-form/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedProcessForm';
diff --git a/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessForm.test.tsx b/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessForm.test.tsx
index 4cf5e01cba..aeada07233 100644
--- a/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessForm.test.tsx
+++ b/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { mount } from 'enzyme';
 import React from 'react';
 import {
diff --git a/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessFormChannelApiImpl.test.ts b/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessFormChannelApiImpl.test.ts
index 147163a982..19fb941129 100755
--- a/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessFormChannelApiImpl.test.ts
+++ b/ui-packages/packages/process-form/src/embedded/tests/EmbeddedProcessFormChannelApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessFormDriver } from '../../api';
 import { EmbeddedProcessFormChannelApiImpl } from '../EmbeddedProcessFormChannelApiImpl';
 import { MockedProcessFormDriver } from './mocks/Mocks';
diff --git a/ui-packages/packages/process-form/src/embedded/tests/mocks/Mocks.ts b/ui-packages/packages/process-form/src/embedded/tests/mocks/Mocks.ts
index 89c467fc68..f3ce388883 100644
--- a/ui-packages/packages/process-form/src/embedded/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-form/src/embedded/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessFormDriver } from '../../../api';
 
 export const MockedProcessFormDriver = jest.fn<ProcessFormDriver, []>(() => ({
diff --git a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelope.tsx b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelope.tsx
index efc021a666..4d761ad70d 100644
--- a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelope.tsx
+++ b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeApiImpl.ts b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeApiImpl.ts
index 8f8923637d..1e629e5d7a 100644
--- a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeApiImpl.ts
+++ b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { ProcessFormEnvelopeViewApi } from './ProcessFormEnvelopeView';
 import {
diff --git a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeContext.ts b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeContext.ts
index 01063d632f..6d03ea4028 100644
--- a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeContext.ts
+++ b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeView.tsx b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeView.tsx
index 7dbf52528d..13d15419bb 100644
--- a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeView.tsx
+++ b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.s
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { ProcessDefinition, ProcessFormChannelApi } from '../api';
diff --git a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeViewDriver.ts b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeViewDriver.ts
index dc9db5587f..98a13ed474 100644
--- a/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeViewDriver.ts
+++ b/ui-packages/packages/process-form/src/envelope/ProcessFormEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   ProcessDefinition,
diff --git a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/ProcessForm.tsx b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/ProcessForm.tsx
index 555792d405..103b0fd2d3 100644
--- a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/ProcessForm.tsx
+++ b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/ProcessForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/__mocks__/ProcessForm.tsx b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/__mocks__/ProcessForm.tsx
index 52708a393e..edc9f02987 100644
--- a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/__mocks__/ProcessForm.tsx
+++ b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/__mocks__/ProcessForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessForm = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/ProcessForm.test.tsx b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/ProcessForm.test.tsx
index dce5804683..5702578c31 100644
--- a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/ProcessForm.test.tsx
+++ b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/ProcessForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import _ from 'lodash';
diff --git a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/mocks/ConfirmTravelForm.ts b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/mocks/ConfirmTravelForm.ts
index a5045b47bf..412a18ab7c 100644
--- a/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/mocks/ConfirmTravelForm.ts
+++ b/ui-packages/packages/process-form/src/envelope/components/ProcessForm/tests/mocks/ConfirmTravelForm.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export const ConfirmTravelForm = {
   type: 'object',
   properties: {
diff --git a/ui-packages/packages/process-form/src/envelope/index.ts b/ui-packages/packages/process-form/src/envelope/index.ts
index 8401a6c1b6..d0011c6488 100644
--- a/ui-packages/packages/process-form/src/envelope/index.ts
+++ b/ui-packages/packages/process-form/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessFormEnvelope';
diff --git a/ui-packages/packages/process-form/src/envelope/styles.css b/ui-packages/packages/process-form/src/envelope/styles.css
index fd66e62729..d6322c4d6f 100644
--- a/ui-packages/packages/process-form/src/envelope/styles.css
+++ b/ui-packages/packages/process-form/src/envelope/styles.css
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-process-form-container {
-    height: 100%;
-}
\ No newline at end of file
+  height: 100%;
+}
diff --git a/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeApiImpl.test.ts b/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeApiImpl.test.ts
index e5e4ef2bb2..8a9ed3cd48 100644
--- a/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import {
   MockedEnvelopeClient,
diff --git a/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeView.test.tsx b/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeView.test.tsx
index ccba1340d4..d3fd28969d 100644
--- a/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeView.test.tsx
+++ b/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeViewDriver.test.ts b/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeViewDriver.test.ts
index b639e16afd..4cf1a308f4 100644
--- a/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/process-form/src/envelope/tests/ProcessFormEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/process-form/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/process-form/src/envelope/tests/mocks/Mocks.ts
index 7ba69ceced..98e0b50a87 100644
--- a/ui-packages/packages/process-form/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-form/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ApiNotificationConsumers,
   MessageBusClientApi,
diff --git a/ui-packages/packages/process-form/src/index.ts b/ui-packages/packages/process-form/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/process-form/src/index.ts
+++ b/ui-packages/packages/process-form/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/process-list/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/process-list/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/process-list/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/process-list/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/process-list/config/Jest-config/fileMocks.js b/ui-packages/packages/process-list/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/process-list/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/process-list/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/process-list/config/Jest-config/global-setup.js b/ui-packages/packages/process-list/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/process-list/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/process-list/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/process-list/config/Jest-config/styleMocks.js b/ui-packages/packages/process-list/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/process-list/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/process-list/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/process-list/config/Jest-config/test-setup.js b/ui-packages/packages/process-list/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/process-list/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/process-list/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/process-list/config/Jest-config/test-shim.js b/ui-packages/packages/process-list/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/process-list/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/process-list/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/process-list/jest.config.js b/ui-packages/packages/process-list/jest.config.js
index 26cccac35f..b9c3b2158e 100644
--- a/ui-packages/packages/process-list/jest.config.js
+++ b/ui-packages/packages/process-list/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/process-list/package.json b/ui-packages/packages/process-list/package.json
index 9eb56b7dee..9fc06e367c 100644
--- a/ui-packages/packages/process-list/package.json
+++ b/ui-packages/packages/process-list/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/management-console-shared": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
@@ -48,8 +48,8 @@
     "@babel/preset-env": "^7.22.7",
     "@babel/preset-react": "^7.22.5",
     "@kogito-apps/ouia-tools": "workspace:*",
-    "@testing-library/react": "^11.2.6",
     "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^11.2.6",
     "@types/jest": "^26.0.24",
     "@types/react": "17.0.5",
     "@types/react-dom": "^17.0.20",
diff --git a/ui-packages/packages/process-list/src/api/ProcessListApi.ts b/ui-packages/packages/process-list/src/api/ProcessListApi.ts
index e372e7133e..290ee2f7b1 100644
--- a/ui-packages/packages/process-list/src/api/ProcessListApi.ts
+++ b/ui-packages/packages/process-list/src/api/ProcessListApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface ProcessListApi {}
diff --git a/ui-packages/packages/process-list/src/api/ProcessListChannelApi.ts b/ui-packages/packages/process-list/src/api/ProcessListChannelApi.ts
index 1af3049690..c3e290111f 100644
--- a/ui-packages/packages/process-list/src/api/ProcessListChannelApi.ts
+++ b/ui-packages/packages/process-list/src/api/ProcessListChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   BulkProcessInstanceActionResponse,
   ProcessInstance,
diff --git a/ui-packages/packages/process-list/src/api/ProcessListDriver.ts b/ui-packages/packages/process-list/src/api/ProcessListDriver.ts
index fdf7e410f0..63fb652f33 100644
--- a/ui-packages/packages/process-list/src/api/ProcessListDriver.ts
+++ b/ui-packages/packages/process-list/src/api/ProcessListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   BulkProcessInstanceActionResponse,
   ProcessInstance,
diff --git a/ui-packages/packages/process-list/src/api/ProcessListEnvelopeApi.ts b/ui-packages/packages/process-list/src/api/ProcessListEnvelopeApi.ts
index afb4756c46..1ba9b1564c 100644
--- a/ui-packages/packages/process-list/src/api/ProcessListEnvelopeApi.ts
+++ b/ui-packages/packages/process-list/src/api/ProcessListEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessListState } from '@kogito-apps/management-console-shared/dist/types';
 export interface ProcessListEnvelopeApi {
   processList__init(
diff --git a/ui-packages/packages/process-list/src/api/index.ts b/ui-packages/packages/process-list/src/api/index.ts
index a3856c3b19..4639ecf2fd 100644
--- a/ui-packages/packages/process-list/src/api/index.ts
+++ b/ui-packages/packages/process-list/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessListApi';
 export * from './ProcessListChannelApi';
 export * from './ProcessListDriver';
diff --git a/ui-packages/packages/process-list/src/embedded/EmbeddedProcessList.tsx b/ui-packages/packages/process-list/src/embedded/EmbeddedProcessList.tsx
index 37c3eeacd2..4b9f8699ed 100644
--- a/ui-packages/packages/process-list/src/embedded/EmbeddedProcessList.tsx
+++ b/ui-packages/packages/process-list/src/embedded/EmbeddedProcessList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
diff --git a/ui-packages/packages/process-list/src/embedded/ProcessListChannelApiImpl.ts b/ui-packages/packages/process-list/src/embedded/ProcessListChannelApiImpl.ts
index cc5aee3b61..9cd02d4280 100644
--- a/ui-packages/packages/process-list/src/embedded/ProcessListChannelApiImpl.ts
+++ b/ui-packages/packages/process-list/src/embedded/ProcessListChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessListChannelApi, ProcessListDriver } from '../api';
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/process-list/src/embedded/index.ts b/ui-packages/packages/process-list/src/embedded/index.ts
index 89dd24ac16..bcf592fd2b 100644
--- a/ui-packages/packages/process-list/src/embedded/index.ts
+++ b/ui-packages/packages/process-list/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedProcessList';
diff --git a/ui-packages/packages/process-list/src/embedded/tests/EmbeddedProcessList.test.tsx b/ui-packages/packages/process-list/src/embedded/tests/EmbeddedProcessList.test.tsx
index b53acb3be9..2d48133332 100644
--- a/ui-packages/packages/process-list/src/embedded/tests/EmbeddedProcessList.test.tsx
+++ b/ui-packages/packages/process-list/src/embedded/tests/EmbeddedProcessList.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedProcessList } from '../EmbeddedProcessList';
 import { MockedProcessListDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/process-list/src/embedded/tests/ProcessListChannelApiImpl.test.ts b/ui-packages/packages/process-list/src/embedded/tests/ProcessListChannelApiImpl.test.ts
index 41d1f91840..cee9d4c69c 100644
--- a/ui-packages/packages/process-list/src/embedded/tests/ProcessListChannelApiImpl.test.ts
+++ b/ui-packages/packages/process-list/src/embedded/tests/ProcessListChannelApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessListChannelApiImpl } from '../ProcessListChannelApiImpl';
 import { ProcessListDriver } from '../../api';
 import { MockedProcessListDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/process-list/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/process-list/src/embedded/tests/utils/Mocks.ts
index ff48cd64cc..1e46159231 100644
--- a/ui-packages/packages/process-list/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/process-list/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessListDriver } from '../../../api';
 
 export const MockedProcessListDriver = jest.fn<ProcessListDriver, []>(() => ({
diff --git a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelope.tsx b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelope.tsx
index 8d41a50189..c4b352d65b 100644
--- a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelope.tsx
+++ b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeApiImpl.ts b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeApiImpl.ts
index c7a0f471be..2f331144ff 100644
--- a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeApiImpl.ts
+++ b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { ProcessListEnvelopeViewApi } from './ProcessListEnvelopeView';
 import {
diff --git a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeContext.ts b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeContext.ts
index b5cd607a9c..76bd19ab2e 100644
--- a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeContext.ts
+++ b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeView.tsx b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeView.tsx
index 6797df5f58..8892731445 100644
--- a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeView.tsx
+++ b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeViewDriver.ts b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeViewDriver.ts
index aad3344c3a..e470a437fa 100644
--- a/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeViewDriver.ts
+++ b/ui-packages/packages/process-list/src/envelope/ProcessListEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/process-list/src/envelope/components/DisablePopup/DisablePopup.tsx b/ui-packages/packages/process-list/src/envelope/components/DisablePopup/DisablePopup.tsx
index bc44ec6ae8..de3e748081 100644
--- a/ui-packages/packages/process-list/src/envelope/components/DisablePopup/DisablePopup.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/DisablePopup/DisablePopup.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { ReactElement } from 'react';
 import { Tooltip } from '@patternfly/react-core/dist/js/components/Tooltip';
diff --git a/ui-packages/packages/process-list/src/envelope/components/DisablePopup/__mocks__/DisablePopup.tsx b/ui-packages/packages/process-list/src/envelope/components/DisablePopup/__mocks__/DisablePopup.tsx
index c64c039b0d..0a20c5538c 100644
--- a/ui-packages/packages/process-list/src/envelope/components/DisablePopup/__mocks__/DisablePopup.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/DisablePopup/__mocks__/DisablePopup.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-list/src/envelope/components/DisablePopup/tests/DisablePopup.test.tsx b/ui-packages/packages/process-list/src/envelope/components/DisablePopup/tests/DisablePopup.test.tsx
index 5602402e5b..aadc786a5d 100644
--- a/ui-packages/packages/process-list/src/envelope/components/DisablePopup/tests/DisablePopup.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/DisablePopup/tests/DisablePopup.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/ErrorPopover.tsx b/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/ErrorPopover.tsx
index bc446f9a55..750c5dac54 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/ErrorPopover.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/ErrorPopover.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { Popover } from '@patternfly/react-core/dist/js/components/Popover';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/__mocks__/ErrorPopover.tsx b/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/__mocks__/ErrorPopover.tsx
index 40938d72cb..356382165d 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/__mocks__/ErrorPopover.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/__mocks__/ErrorPopover.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/tests/ErrorPopover.test.tsx b/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/tests/ErrorPopover.test.tsx
index 18157d139b..206fbee85a 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/tests/ErrorPopover.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ErrorPopover/tests/ErrorPopover.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import ErrorPopover from '../ErrorPopover';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessList/ProcessList.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessList/ProcessList.tsx
index 19159824fe..12c5dedb0b 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessList/ProcessList.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessList/ProcessList.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import { ProcessListDriver } from '../../../api';
 import {
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessList/__mocks__/ProcessList.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessList/__mocks__/ProcessList.tsx
index 6411addc87..459e7a61f4 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessList/__mocks__/ProcessList.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessList/__mocks__/ProcessList.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/ProcessList.test.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/ProcessList.test.tsx
index 964b0ebafb..b1ae4e0dc9 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/ProcessList.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/ProcessList.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/Mocks.ts b/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/Mocks.ts
index 31d17ce55a..415d975a9f 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/Mocks.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/TestProcessListDriver.ts b/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/TestProcessListDriver.ts
index 07d9db93c8..b503f95d08 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/TestProcessListDriver.ts
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessList/tests/mocks/TestProcessListDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   BulkProcessInstanceActionResponse,
   ProcessInstance,
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/ProcessListActionsKebab.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/ProcessListActionsKebab.tsx
index 1bc82e94c0..da2a5bc199 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/ProcessListActionsKebab.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/ProcessListActionsKebab.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useMemo, useState } from 'react';
 import {
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/__mocks__/ProcessListActionsKebab.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/__mocks__/ProcessListActionsKebab.tsx
index 7d11d52c51..1bf4a2e680 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/__mocks__/ProcessListActionsKebab.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/__mocks__/ProcessListActionsKebab.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/tests/ProcessListActionsKebab.test.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/tests/ProcessListActionsKebab.test.tsx
index ca79fe6c6e..ba74e4eed4 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/tests/ProcessListActionsKebab.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListActionsKebab/tests/ProcessListActionsKebab.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import ProcessListActionsKebab from '../ProcessListActionsKebab';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/ProcessListChildTable.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/ProcessListChildTable.tsx
index 2ac6fdb1ac..49e9d9da7e 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/ProcessListChildTable.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/ProcessListChildTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessListDriver } from '../../../api';
 import {
   ICell,
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/__mocks__/ProcessListChildTable.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/__mocks__/ProcessListChildTable.tsx
index abde8df458..dcd792508a 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/__mocks__/ProcessListChildTable.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/__mocks__/ProcessListChildTable.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessListChildTable = (): React.ReactElement => {
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/ProcessListChildTable.test.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/ProcessListChildTable.test.tsx
index 3226cb25b8..c82f2b7c44 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/ProcessListChildTable.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/ProcessListChildTable.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/mocks/Mocks.ts b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/mocks/Mocks.ts
index 26b86bb0a7..85fb0be4fc 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListChildTable/tests/mocks/Mocks.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/ProcessListTable.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/ProcessListTable.tsx
index 8f2e64480d..35ab61780f 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/ProcessListTable.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/ProcessListTable.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useEffect, useMemo, useState } from 'react';
 import { ExpandableRowContent } from '@patternfly/react-table/dist/js/components/Table';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/__mocks__/ProcessListTable.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/__mocks__/ProcessListTable.tsx
index 8b131415fa..c27bac8ffa 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/__mocks__/ProcessListTable.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/__mocks__/ProcessListTable.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/ProcessListTable.test.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/ProcessListTable.test.tsx
index a82116944b..2d4ea6de85 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/ProcessListTable.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/ProcessListTable.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/mocks/Mocks.ts b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/mocks/Mocks.ts
index b7f1474421..44caefe810 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListTable/tests/mocks/Mocks.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/ProcessListToolbar.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/ProcessListToolbar.tsx
index 1529a941ca..edd563fa1d 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/ProcessListToolbar.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/ProcessListToolbar.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useCallback, useState } from 'react';
 import {
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/ProcessListToolbar.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/ProcessListToolbar.tsx
index f357407823..3801579354 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/ProcessListToolbar.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/ProcessListToolbar.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/tabbable.js b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/tabbable.js
index d86d325edc..02d3358598 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/tabbable.js
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/__mocks__/tabbable.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const lib = jest.requireActual('tabbable');
 
 const tabbable = {
diff --git a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/tests/ProcessListToolbar.test.tsx b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/tests/ProcessListToolbar.test.tsx
index f37fdf88a6..ee8c632a96 100644
--- a/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/tests/ProcessListToolbar.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/ProcessListToolbar/tests/ProcessListToolbar.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { render, screen, waitFor, fireEvent } from '@testing-library/react';
diff --git a/ui-packages/packages/process-list/src/envelope/components/styles.css b/ui-packages/packages/process-list/src/envelope/components/styles.css
index 53c21618c1..0292f96800 100644
--- a/ui-packages/packages/process-list/src/envelope/components/styles.css
+++ b/ui-packages/packages/process-list/src/envelope/components/styles.css
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 .kogito-management-console__state-dropdown-list
   .pf-c-data-toolbar__item:first-child
@@ -39,7 +42,7 @@
 
 .kogito-management-console__compact-table {
   border-left: solid;
-  border-left-color:var(--pf-global--active-color--100);
+  border-left-color: var(--pf-global--active-color--100);
 }
 
 .kogito-process-list__emptyState-card {
@@ -47,4 +50,4 @@
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
-}
\ No newline at end of file
+}
diff --git a/ui-packages/packages/process-list/src/envelope/components/utils/ProcessListUtils.tsx b/ui-packages/packages/process-list/src/envelope/components/utils/ProcessListUtils.tsx
index 8eb8bee4f5..1d8eb181d9 100644
--- a/ui-packages/packages/process-list/src/envelope/components/utils/ProcessListUtils.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/utils/ProcessListUtils.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { BanIcon } from '@patternfly/react-icons/dist/js/icons/ban-icon';
diff --git a/ui-packages/packages/process-list/src/envelope/components/utils/tests/ProcessListUtils.test.tsx b/ui-packages/packages/process-list/src/envelope/components/utils/tests/ProcessListUtils.test.tsx
index 25e1ba41a7..3b7fe876b2 100644
--- a/ui-packages/packages/process-list/src/envelope/components/utils/tests/ProcessListUtils.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/components/utils/tests/ProcessListUtils.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import {
   ProcessInstanceState,
diff --git a/ui-packages/packages/process-list/src/envelope/index.ts b/ui-packages/packages/process-list/src/envelope/index.ts
index b958dda81b..03ded52fe7 100644
--- a/ui-packages/packages/process-list/src/envelope/index.ts
+++ b/ui-packages/packages/process-list/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './ProcessListEnvelope';
diff --git a/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeApiImpl.test.ts b/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeApiImpl.test.ts
index 9bc40af9ea..02cc4f2faf 100644
--- a/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedProcessListEnvelopeViewApi
diff --git a/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeView.test.tsx b/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeView.test.tsx
index 1e72f13849..f98c8d32a6 100644
--- a/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeView.test.tsx
+++ b/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeViewDriver.test.ts b/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeViewDriver.test.ts
index 713a4464ae..54d7bb85ec 100644
--- a/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/process-list/src/envelope/tests/ProcessListEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/process-list/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/process-list/src/envelope/tests/mocks/Mocks.ts
index 50d78a8325..ae24a2f5ee 100644
--- a/ui-packages/packages/process-list/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/process-list/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ApiNotificationConsumers,
   MessageBusClientApi,
diff --git a/ui-packages/packages/process-list/src/index.ts b/ui-packages/packages/process-list/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/process-list/src/index.ts
+++ b/ui-packages/packages/process-list/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/runtime-gateway-api/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/runtime-gateway-api/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/runtime-gateway-api/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/runtime-gateway-api/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/runtime-gateway-api/config/Jest-config/fileMocks.js b/ui-packages/packages/runtime-gateway-api/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/runtime-gateway-api/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/runtime-gateway-api/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/runtime-gateway-api/config/Jest-config/global-setup.js b/ui-packages/packages/runtime-gateway-api/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/runtime-gateway-api/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/runtime-gateway-api/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/runtime-gateway-api/config/Jest-config/styleMocks.js b/ui-packages/packages/runtime-gateway-api/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/runtime-gateway-api/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/runtime-gateway-api/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-setup.js b/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-shim.js b/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/runtime-gateway-api/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/runtime-gateway-api/jest.config.js b/ui-packages/packages/runtime-gateway-api/jest.config.js
index e3a24daf47..9b5cd84682 100644
--- a/ui-packages/packages/runtime-gateway-api/jest.config.js
+++ b/ui-packages/packages/runtime-gateway-api/jest.config.js
@@ -1,53 +1,45 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
-    setupFiles: [
-        "./config/Jest-config/test-shim.js",
-        "./config/Jest-config/test-setup.js",
-        "core-js"
-    ],
-    moduleFileExtensions: [
-        "ts",
-        "tsx",
-        "js"
-    ],
-    coveragePathIgnorePatterns: [
-        "./src/static",
-        "./src/graphql",
-        "dist/"
-    ],
-    coverageReporters: [
-        [
-            "lcov",
-            {
-                projectRoot: "../../"
-            }
-        ]
-    ],
-    transformIgnorePatterns: [],
-    transform: {
-        "^.+\.jsx?$": "./config/Jest-config/babel-jest-wrapper.js",
-        "^.+\.(ts|tsx)$": "ts-jest",
-        "\.(jpg|jpeg|png|svg)$": "./config/Jest-config/fileMocks.js"
-    },
-    testMatch: [
-        "**/tests/*.(ts|tsx|js)"
-    ],
-    moduleNameMapper: {
-        "\.(scss|sass|css)$": "identity-obj-proxy"
-    }
-}
+  setupFiles: [
+    './config/Jest-config/test-shim.js',
+    './config/Jest-config/test-setup.js',
+    'core-js'
+  ],
+  moduleFileExtensions: ['ts', 'tsx', 'js'],
+  coveragePathIgnorePatterns: ['./src/static', './src/graphql', 'dist/'],
+  coverageReporters: [
+    [
+      'lcov',
+      {
+        projectRoot: '../../'
+      }
+    ]
+  ],
+  transformIgnorePatterns: [],
+  transform: {
+    '^.+.jsx?$': './config/Jest-config/babel-jest-wrapper.js',
+    '^.+.(ts|tsx)$': 'ts-jest',
+    '.(jpg|jpeg|png|svg)$': './config/Jest-config/fileMocks.js'
+  },
+  testMatch: ['**/tests/*.(ts|tsx|js)'],
+  moduleNameMapper: {
+    '.(scss|sass|css)$': 'identity-obj-proxy'
+  }
+};
diff --git a/ui-packages/packages/runtime-gateway-api/src/apis/QueryUtils.ts b/ui-packages/packages/runtime-gateway-api/src/apis/QueryUtils.ts
index 33bbfbf6ee..532b61fa4b 100644
--- a/ui-packages/packages/runtime-gateway-api/src/apis/QueryUtils.ts
+++ b/ui-packages/packages/runtime-gateway-api/src/apis/QueryUtils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessInstanceFilter } from '@kogito-apps/management-console-shared/dist/types';
 
 const formatSearchWords = (searchWords: string[]) => {
diff --git a/ui-packages/packages/runtime-gateway-api/src/apis/apis.tsx b/ui-packages/packages/runtime-gateway-api/src/apis/apis.tsx
index c3b97cfa36..58b72266b5 100644
--- a/ui-packages/packages/runtime-gateway-api/src/apis/apis.tsx
+++ b/ui-packages/packages/runtime-gateway-api/src/apis/apis.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/runtime-gateway-api/src/apis/index.ts b/ui-packages/packages/runtime-gateway-api/src/apis/index.ts
index bdf9b9f89c..09f8a8e884 100644
--- a/ui-packages/packages/runtime-gateway-api/src/apis/index.ts
+++ b/ui-packages/packages/runtime-gateway-api/src/apis/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './apis';
diff --git a/ui-packages/packages/runtime-gateway-api/src/apis/tests/QueryUtils.test.ts b/ui-packages/packages/runtime-gateway-api/src/apis/tests/QueryUtils.test.ts
index f1a610a098..336672fe7e 100644
--- a/ui-packages/packages/runtime-gateway-api/src/apis/tests/QueryUtils.test.ts
+++ b/ui-packages/packages/runtime-gateway-api/src/apis/tests/QueryUtils.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessInstanceState } from '@kogito-apps/management-console-shared/dist/types';
 import { buildProcessListWhereArgument } from '../QueryUtils';
 
diff --git a/ui-packages/packages/runtime-gateway-api/src/apis/tests/apis.test.tsx b/ui-packages/packages/runtime-gateway-api/src/apis/tests/apis.test.tsx
index 7580260ed1..53d6148a9e 100644
--- a/ui-packages/packages/runtime-gateway-api/src/apis/tests/apis.test.tsx
+++ b/ui-packages/packages/runtime-gateway-api/src/apis/tests/apis.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 // import wait from 'waait';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/__mocks__/monacoMock.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/__mocks__/monacoMock.js
index 640dd2a004..9d985d8ba1 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/__mocks__/monacoMock.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/__mocks__/monacoMock.js
@@ -1,10 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {
-    languages: {
-      register: function(language) {},
-      setMonarchTokensProvider: function(name, tokens) {},
-      registerCompletionItemProvider: function(name, provider) {}
-    },
-    editor: {
-      defineTheme: function(name, theme) {}
-    }
-  };
\ No newline at end of file
+  languages: {
+    register: function (language) {},
+    setMonarchTokensProvider: function (name, tokens) {},
+    registerCompletionItemProvider: function (name, provider) {}
+  },
+  editor: {
+    defineTheme: function (name, theme) {}
+  }
+};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/fileMocks.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/fileMocks.js
index 3e181c0ffe..6311862eb0 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/global-setup.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/styleMocks.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-setup.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-shim.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/declare.d.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/declare.d.ts
index 0004da08d4..3cfbfeeca3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/config/declare.d.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/config/declare.d.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 declare module '*.svg' {
   const content: string;
   export default content;
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/jest.config.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/jest.config.js
index a6320eef62..735535f952 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/jest.config.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   preset: 'ts-jest/presets/js-with-ts',
   setupFiles: [
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json b/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json
index bbcdf60176..f89f6fd031 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/package.json
@@ -34,15 +34,14 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@babel/standalone": "^7.22.8",
-    "@kie-tools-core/editor": "0.30.0",
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
-    "@kie-tools-core/keyboard-shortcuts": "0.30.0",
-    "@kie-tools/serverless-workflow-combined-editor": "0.30.0",
-    "@kie-tools/serverless-workflow-diagram-editor-assets": "0.30.0",
-    "@kie-tools/serverless-workflow-diagram-editor-envelope": "0.30.0",
-    "@kie-tools/serverless-workflow-mermaid-viewer": "0.30.0",
-    "@kie-tools/serverless-workflow-text-editor": "0.30.0",
+    "@kie-tools-core/editor": "0.32.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
+    "@kie-tools-core/keyboard-shortcuts": "0.32.0",
+    "@kie-tools/serverless-workflow-combined-editor": "0.32.0",
+    "@kie-tools/serverless-workflow-diagram-editor-assets": "0.32.0",
+    "@kie-tools/serverless-workflow-diagram-editor-envelope": "0.32.0",
+    "@kie-tools/serverless-workflow-text-editor": "0.32.0",
     "@kogito-apps/cloud-event-form": "workspace:*",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/consoles-common": "workspace:*",
@@ -119,7 +118,7 @@
     "cypress": "^12.17.0",
     "express": "^4.18.2",
     "file-loader": "^6.2.0",
-    "filemanager-webpack-plugin": "^6.1.7",
+    "filemanager-webpack-plugin": "^7.0.0",
     "html-webpack-plugin": "^5.5.3",
     "https-browserify": "^1.0.0",
     "identity-obj-proxy": "^3.0.0",
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/form-displayer.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/form-displayer.html
index f7c087b1a3..4e710445ec 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/form-displayer.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/form-displayer.html
@@ -1,44 +1,50 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-  <!DOCTYPE html>
-  <html lang="en">
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<!DOCTYPE html>
+<html lang="en">
   <head>
-      <style>
-          html,
-          body,
-          div#envelope-app {
-              margin: 0;
-              border: 0;
-              padding: 0;
-              overflow: hidden;
-              height: 100%;
-              width: 100%;
-              font-family: "Open Sans", Helvetica, Arial, sans-serif;
-          }
-      </style>
-  
-      <title></title>
-      <meta charset="UTF-8" />
-      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <style>
+      html,
+      body,
+      div#envelope-app {
+        margin: 0;
+        border: 0;
+        padding: 0;
+        overflow: hidden;
+        height: 100%;
+        width: 100%;
+        font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+      }
+    </style>
+
+    <title></title>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body style="overflow-y: auto;">
-  <div id="displayer-app"></div>
-  <script> var exports = {}; </script>
-  <script src="./form-displayer.js"></script>
+  <body style="overflow-y: auto">
+    <div id="displayer-app"></div>
+    <script>
+      var exports = {};
+    </script>
+    <script src="./form-displayer.js"></script>
   </body>
-  </html>  
\ No newline at end of file
+</html>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/iframe.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/iframe.html
index 7457c672fb..ae0a234728 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/iframe.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/iframe.html
@@ -1,30 +1,38 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
-<head>
+  <head>
     <meta charset="utf-8" />
     <title>Kogito Runtime Tools - Dev UI</title>
-    <meta id="appName" name="application-name" content="Kogito Runtime Tools - Dev UI" />
+    <meta
+      id="appName"
+      name="application-name"
+      content="Kogito Runtime Tools - Dev UI"
+    />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-</head>
-<body class="pf-m-redhat-font">
-<noscript>Enabling JavaScript is required to run this app.</noscript>
-<div id="envelope-app" style="height: 100%;"></div>
-<script type="text/javascript" src="resources/webapp/envelope.js"></script>
-</body>
-</html>
\ No newline at end of file
+  </head>
+  <body class="pf-m-redhat-font">
+    <noscript>Enabling JavaScript is required to run this app.</noscript>
+    <div id="envelope-app" style="height: 100%"></div>
+    <script type="text/javascript" src="resources/webapp/envelope.js"></script>
+  </body>
+</html>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/index.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/index.html
index ffa9e6d235..e693be92e9 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/index.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/index.html
@@ -1,19 +1,23 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!-- This file is used for test purposes only -->
 
 <!DOCTYPE html>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-combined-editor-envelope.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-combined-editor-envelope.html
index eab79b1072..db47d38c71 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-combined-editor-envelope.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-combined-editor-envelope.html
@@ -1,19 +1,23 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en">
   <head>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-diagram-editor-envelope.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-diagram-editor-envelope.html
index 47735939a2..f8abf21895 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-diagram-editor-envelope.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-diagram-editor-envelope.html
@@ -1,19 +1,23 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en">
   <head>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-mermaid-viewer-envelope.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-mermaid-viewer-envelope.html
deleted file mode 100644
index 6a6e192375..0000000000
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-mermaid-viewer-envelope.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <style>
-      html,
-      body,
-      div#envelope-app {
-        margin: 0;
-        border: 0;
-        padding: 0;
-        overflow: hidden;
-        height: 100%;
-        width: 100%;
-      }
-    </style>
-
-    <title></title>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  </head>
-  <body>
-    <div id="swf-mermaid-viewer-envelope-app"></div>
-    <script src="serverless-workflow-mermaid-viewer-envelope.js"></script>
-  </body>
-</html>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-text-editor-envelope.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-text-editor-envelope.html
index b3c3bd478a..9007b2f598 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-text-editor-envelope.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/resources/serverless-workflow-text-editor-envelope.html
@@ -1,19 +1,23 @@
 <!--
-  ~ Copyright 2022 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en">
   <head>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/controllers.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/controllers.js
index 10caf029b6..53fadea725 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/controllers.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/controllers.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const restData = require('./rest');
 const graphData = require('./graphql');
 const path = require('path');
@@ -34,25 +52,30 @@ const formsUnableToSave = [
   'react_hiring_ITInterview'
 ];
 
-const processSvg = ['8035b580-6ae4-4aa8-9ec0-e18e19809e0b', '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop', '2d962eef-45b8-48a9-ad4e-9cde0ad6af88', 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e']
+const processSvg = [
+  '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+  '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop',
+  '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+  'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e'
+];
 module.exports = controller = {
   showError: (req, res) => {
     console.log('called', req.params.processId, req.params.processInstanceId);
     const { process } = restData.management;
-    const processId = process.filter(data => {
+    const processId = process.filter((data) => {
       return data.processId === req.params.processId;
     });
-    const error = processId[0].instances.filter(err => {
+    const error = processId[0].instances.filter((err) => {
       return err.processInstanceId === req.params.processInstanceId;
     });
     res.send(error[0].error);
   },
   callRetrigger: (req, res) => {
     const { process } = restData.management;
-    const processId = process.filter(data => {
+    const processId = process.filter((data) => {
       return data.processId === req.params.processId;
     });
-    const error = processId[0].instances.filter(err => {
+    const error = processId[0].instances.filter((err) => {
       return err.processInstanceId === req.params.processInstanceId;
     });
     switch (error[0].retrigger) {
@@ -72,10 +95,10 @@ module.exports = controller = {
   },
   callSkip: (req, res) => {
     const { process } = restData.management;
-    const processId = process.filter(data => {
+    const processId = process.filter((data) => {
       return data.processId === req.params.processId;
     });
-    const error = processId[0].instances.filter(err => {
+    const error = processId[0].instances.filter((err) => {
       return err.processInstanceId === req.params.processInstanceId;
     });
     switch (error[0].skip) {
@@ -94,8 +117,11 @@ module.exports = controller = {
     }
   },
   callAbort: (req, res) => {
-    const failedAbortInstances = ['8035b580-6ae4-4aa8-9ec0-e18e19809e0b2', '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3']
-    const data = graphData.ProcessInstanceData.filter(data => {
+    const failedAbortInstances = [
+      '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
+      '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3'
+    ];
+    const data = graphData.ProcessInstanceData.filter((data) => {
       return data.id === req.params.processInstanceId;
     });
     if (failedAbortInstances.includes(data[0].id)) {
@@ -106,59 +132,65 @@ module.exports = controller = {
     }
   },
   callNodeRetrigger: (req, res) => {
-    const data = graphData.ProcessInstanceData.filter(data => {
+    const data = graphData.ProcessInstanceData.filter((data) => {
       return data.id === req.params.processInstanceId;
     });
-    const nodeObject = data[0].nodes.filter(node => node.id === req.params.nodeInstanceId);
+    const nodeObject = data[0].nodes.filter(
+      (node) => node.id === req.params.nodeInstanceId
+    );
     if (nodeObject[0].name.includes('not found')) {
-      res.status(404).send('node not found')
-    }
-    else {
+      res.status(404).send('node not found');
+    } else {
       nodeObject[0].enter = new Date().toISOString();
       res.status(200).send(data[0]);
     }
   },
   callNodeCancel: (req, res) => {
-    const data = graphData.ProcessInstanceData.filter(data => {
+    const data = graphData.ProcessInstanceData.filter((data) => {
       return data.id === req.params.processInstanceId;
     });
-    const nodeObject = data[0].nodes.filter(node => node.id === req.params.nodeInstanceId);
+    const nodeObject = data[0].nodes.filter(
+      (node) => node.id === req.params.nodeInstanceId
+    );
     if (nodeObject[0].name.includes('not found')) {
-      res.status(404).send('node not found')
-    }
-    else {
+      res.status(404).send('node not found');
+    } else {
       nodeObject[0].exit = new Date().toIProcessInstanceDataSOString();
       res.status(200).send(data[0]);
     }
   },
   handleJobReschedule: (req, res) => {
-    const data = graphData.JobsData.find(data => {
+    const data = graphData.JobsData.find((data) => {
       return data.id === req.params.id;
     });
-    if (req.params.id !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0" && req.body.repeatInterval && req.body.repeatLimit) {
+    if (
+      req.params.id !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0' &&
+      req.body.repeatInterval &&
+      req.body.repeatLimit
+    ) {
       data.expirationTime = req.body.expirationTime;
       data.repeatInterval = req.body.repeatInterval;
       data.repeatLimit = req.body.repeatLimit;
     } else {
-      if (req.params.id !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0") {
+      if (req.params.id !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0') {
         data.expirationTime = req.body.expirationTime;
       }
     }
-    if (req.params.id !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0") {
+    if (req.params.id !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0') {
       res.status(200).send(data);
     } else {
-      res.status(400).send('job not rescheduled')
+      res.status(400).send('job not rescheduled');
     }
   },
 
   callNodeTrigger: (req, res) => {
     const graphData = require('./graphql');
     const processInstance = graphData.ProcessInstanceData.filter((process) => {
-      return process.id === req.params.processInstanceId
+      return process.id === req.params.processInstanceId;
     });
     const nodeObject = processInstance[0].nodes.filter((node, index) => {
       if (index !== processInstance[0].nodes.length - 1) {
-        return node.definitionId === req.params.nodeId
+        return node.definitionId === req.params.nodeId;
       }
     });
 
@@ -177,38 +209,40 @@ module.exports = controller = {
     if (req.params.processId !== null || req.params.processId !== undefined) {
       res.send([
         {
-          nodeDefinitionId: "_BDA56801-1155-4AF2-94D4-7DAADED2E3C0",
-          name: "Send visa application",
+          nodeDefinitionId: '_BDA56801-1155-4AF2-94D4-7DAADED2E3C0',
+          name: 'Send visa application',
           id: 1,
-          type: "ActionNode",
-          uniqueId: "1"
+          type: 'ActionNode',
+          uniqueId: '1'
         },
         {
-          nodeDefinitionId: "_175DC79D-C2F1-4B28-BE2D-B583DFABF70D",
-          name: "Book",
+          nodeDefinitionId: '_175DC79D-C2F1-4B28-BE2D-B583DFABF70D',
+          name: 'Book',
           id: 2,
-          type: "Split",
-          uniqueId: "2"
+          type: 'Split',
+          uniqueId: '2'
         },
         {
-          nodeDefinitionId: "_E611283E-30B0-46B9-8305-768A002C7518",
-          name: "visasrejected",
+          nodeDefinitionId: '_E611283E-30B0-46B9-8305-768A002C7518',
+          name: 'visasrejected',
           id: 3,
-          type: "EventNode",
-          uniqueId: "3"
+          type: 'EventNode',
+          uniqueId: '3'
         }
-      ])
+      ]);
     } else {
-      res.send([])
+      res.send([]);
     }
   },
 
   callJobCancel: (req, res) => {
-    const mockFailedJobs = ['dad3aa88-5c1e-4858-a919-6123c675a0fa_0']
+    const mockFailedJobs = ['dad3aa88-5c1e-4858-a919-6123c675a0fa_0'];
     const graphData = require('./graphql');
-    const jobData = graphData.JobsData.filter(job => job.id === req.params.jobId);
+    const jobData = graphData.JobsData.filter(
+      (job) => job.id === req.params.jobId
+    );
     if (mockFailedJobs.includes(jobData[0].id) || jobData.length === 0) {
-      res.status(404).send('job not found')
+      res.status(404).send('job not found');
     } else {
       jobData[0].status = 'CANCELED';
       jobData[0].lastUpdate = new Date().toISOString();
@@ -219,25 +253,25 @@ module.exports = controller = {
     try {
       if (processSvg.includes(req.params.id)) {
         if (req.params.processId === 'travels') {
-          res.sendFile(path.resolve(__dirname + '/../static/travels.svg'))
+          res.sendFile(path.resolve(__dirname + '/../static/travels.svg'));
         } else if (req.params.processId === 'flightBooking') {
-          res.sendFile(path.resolve(__dirname + '/../static/flightBooking.svg'))
+          res.sendFile(
+            path.resolve(__dirname + '/../static/flightBooking.svg')
+          );
         } else if (req.params.processId === 'hotelBooking') {
-          res.sendFile(path.resolve(__dirname + '/../static/hotelBooking.svg'))
+          res.sendFile(path.resolve(__dirname + '/../static/hotelBooking.svg'));
         }
       } else {
         res.send(null);
       }
     } catch (error) {
-      res.status(404).send(error)
+      res.status(404).send(error);
     }
   },
   callCompleteTask: (req, res) => {
-    console.log(
-      `......Transition task: --taskId:${req.params.taskId}`
-    );
+    console.log(`......Transition task: --taskId:${req.params.taskId}`);
 
-    const task = graphData.UserTaskInstances.find(userTask => {
+    const task = graphData.UserTaskInstances.find((userTask) => {
       return userTask.id === req.params.taskId;
     });
 
@@ -260,7 +294,7 @@ module.exports = controller = {
       `......Get Task Form Schema: --processId:${req.params.processId} --piId:${req.params.processInstanceId} --taskId:${req.params.taskId}`
     );
 
-    const task = graphData.UserTaskInstances.find(userTask => {
+    const task = graphData.UserTaskInstances.find((userTask) => {
       return userTask.id === req.params.taskId;
     });
 
@@ -294,7 +328,7 @@ module.exports = controller = {
   getCustomDashboards: (req, res) => {
     const filterNames = req.query.names.split(';');
     if (filterNames[0].length === 0) {
-      res.send(customDashboardData)
+      res.send(customDashboardData);
     } else {
       const filteredCustomDashboards = [];
       filterNames.forEach((name) => {
@@ -304,26 +338,32 @@ module.exports = controller = {
           }
         });
       });
-      res.send(filteredCustomDashboards)
+      res.send(filteredCustomDashboards);
     }
   },
 
   getCustomDashboardContent: (req, res) => {
     const dashboardName = req.params.name;
     let content = '';
-    if(dashboardName === 'age.dash.yaml') {
-      content = fs.readFileSync(__dirname + '/customDashboard/age.dash.yaml', 'utf-8');
-    }
-    if(dashboardName === 'products.dash.yaml') {
-      content = fs.readFileSync(__dirname + '/customDashboard/products.dash.yaml', 'utf-8');
-    }
-    res.send(content)
+    if (dashboardName === 'age.dash.yaml') {
+      content = fs.readFileSync(
+        __dirname + '/customDashboard/age.dash.yaml',
+        'utf-8'
+      );
+    }
+    if (dashboardName === 'products.dash.yaml') {
+      content = fs.readFileSync(
+        __dirname + '/customDashboard/products.dash.yaml',
+        'utf-8'
+      );
+    }
+    res.send(content);
   },
 
   getForms: (req, res) => {
     const formFilterNames = req.query.names.split(';');
     if (formFilterNames[0].length === 0) {
-      res.send(formData)
+      res.send(formData);
     } else {
       const filteredForms = [];
       formFilterNames.forEach((name) => {
@@ -333,7 +373,7 @@ module.exports = controller = {
           }
         });
       });
-      res.send(filteredForms)
+      res.send(filteredForms);
     }
   },
 
@@ -350,25 +390,32 @@ module.exports = controller = {
     }
     let sourceString;
 
-    const configString = fs.readFileSync(path.join(`${__dirname}/forms/examples/${formName}.config`), 'utf8');
+    const configString = fs.readFileSync(
+      path.join(`${__dirname}/forms/examples/${formName}.config`),
+      'utf8'
+    );
     if (formInfo[0].type.toLowerCase() === 'html') {
-      sourceString = fs.readFileSync(path.join(`${__dirname}/forms/examples/${formName}.html`), 'utf8');
+      sourceString = fs.readFileSync(
+        path.join(`${__dirname}/forms/examples/${formName}.html`),
+        'utf8'
+      );
     } else if (formInfo[0].type.toLowerCase() === 'tsx') {
-      sourceString = fs.readFileSync(path.join(`${__dirname}/forms/examples/${formName}.tsx`), 'utf8');
+      sourceString = fs.readFileSync(
+        path.join(`${__dirname}/forms/examples/${formName}.tsx`),
+        'utf8'
+      );
     }
     const response = {
       formInfo: formInfo[0],
       source: sourceString,
       configuration: JSON.parse(configString)
-    }
+    };
 
     res.send(response);
   },
 
   saveFormContent: (req, res) => {
-    console.log(
-      `......Save Form Content: --formName:${req.params.formName}`
-    );
+    console.log(`......Save Form Content: --formName:${req.params.formName}`);
     if (formsUnableToSave.includes(req.params.formName)) {
       res.status(500).send('Unexpected failure saving form!');
     } else {
@@ -427,32 +474,37 @@ module.exports = controller = {
       childProcessInstances: []
     };
     if (businessKey && businessKey.toLowerCase() === 'error') {
-      res.status(500).send('internal server error')
+      res.status(500).send('internal server error');
     }
     graphData['ProcessInstanceData'].push(processInstance);
     res.send({
       id: processId
-    })
+    });
   },
   triggerCloudEvent: (req, res) => {
-    console.log(`......Trigger Cloud Event:: id: ${req.headers['ce-id']} type: ${req.headers['ce-type']} source: ${req.headers['ce-source']}`);
+    console.log(
+      `......Trigger Cloud Event:: id: ${req.headers['ce-id']} type: ${req.headers['ce-type']} source: ${req.headers['ce-source']}`
+    );
 
     if (req.body.type === 'error') {
       res.status(500).send('internal server error');
     }
     if (req.body.kogitobusinesskey) {
-      console.log(`Starting Serverless workflow with business key: ${req.body.kogitobusinesskey}`)
+      console.log(
+        `Starting Serverless workflow with business key: ${req.body.kogitobusinesskey}`
+      );
       return res.status(200).send(req.body.kogitobusinesskey);
-    } else if(req.body.kogitoprocrefid) {
-      console.log(`Serverless Workflow with id ${req.body.kogitoprocrefid} successfully completed`)
+    } else if (req.body.kogitoprocrefid) {
+      console.log(
+        `Serverless Workflow with id ${req.body.kogitoprocrefid} successfully completed`
+      );
       return res.status(200).send(req.body.kogitoprocrefid);
     }
 
-    return res.status(200).send("Cloud Event successfully triggered");
-  },
+    return res.status(200).send('Cloud Event successfully triggered');
+  }
 };
 
-
 function getTaskSchema(taskName, clearPhases) {
   let schema;
 
@@ -485,4 +537,4 @@ function getTaskSchema(taskName, clearPhases) {
   }
 
   return schema;
-}
\ No newline at end of file
+}
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/age.dash.yaml b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/age.dash.yaml
index b6a5fe7278..011aff8684 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/age.dash.yaml
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/age.dash.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 datasets:
   - uuid: age
     content: >-
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/data.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/data.js
index 0506da5e06..946f7b8fcd 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/data.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/data.js
@@ -1,22 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = [
-    {
-        name: 'age.dash.yaml',
-        path: '/usr/home',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    },
-    {
-        name: 'products.dash.yaml',
-        path: '/usr/home',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    },
-    {
-        name: 'age.dash.yaml',
-        path: '/usr/home',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    },
-    {
-        name: 'products.dash.yaml',
-        path: '/usr/home',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    }
-]
\ No newline at end of file
+  {
+    name: 'age.dash.yaml',
+    path: '/usr/home',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  },
+  {
+    name: 'products.dash.yaml',
+    path: '/usr/home',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  },
+  {
+    name: 'age.dash.yaml',
+    path: '/usr/home',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  },
+  {
+    name: 'products.dash.yaml',
+    path: '/usr/home',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  }
+];
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/products.dash.yaml b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/products.dash.yaml
index 88e26858b5..ea685a0b5c 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/products.dash.yaml
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/customDashboard/products.dash.yaml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 datasets:
   - uuid: products
     content: >-
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ApplyForVisa.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ApplyForVisa.js
index a17339e249..d96c654d42 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ApplyForVisa.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ApplyForVisa.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = ApplyForVisaForm = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
   type: 'object',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ConfirmTravel.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ConfirmTravel.js
index e1e1f3881f..08917b8a22 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ConfirmTravel.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ConfirmTravel.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = ConfirmTravelForm = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
   type: 'object',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/EmptyForm.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/EmptyForm.js
index 37df5618b9..80c0c6357b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/EmptyForm.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/EmptyForm.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = ConfirmTravelForm = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
   type: 'object',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/HRInterview.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/HRInterview.js
index a0c7fa3738..0962e35a8b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/HRInterview.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/HRInterview.js
@@ -1,33 +1,36 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = HRInterview = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
-  'type': 'object',
-  'properties': {
-    'candidate': {
-      'type': 'object',
-      'properties': {
-        'email': { 'type': 'string' },
-        'name': { 'type': 'string' },
-        'salary': { 'type': 'integer' },
-        'skills': { 'type': 'string' }
+  type: 'object',
+  properties: {
+    candidate: {
+      type: 'object',
+      properties: {
+        email: { type: 'string' },
+        name: { type: 'string' },
+        salary: { type: 'integer' },
+        skills: { type: 'string' }
       },
-      'input': true
-    }, 'approve': { 'type': 'boolean', 'output': true }
+      input: true
+    },
+    approve: { type: 'boolean', output: true }
   },
   phases: ['complete', 'start', 'claim', 'release']
-};
\ No newline at end of file
+};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ITInterview.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ITInterview.js
index 3bfe95ccd1..d819239dbe 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ITInterview.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/ITInterview.js
@@ -1,34 +1,36 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = HRInterview = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
-  'type': 'object',
-  'properties': {
-    'approve': { 'type': 'boolean', 'output': true },
-    'candidate': {
-      'type': 'object',
-      'properties': {
-        'email': { 'type': 'string' },
-        'name': { 'type': 'string' },
-        'salary': { 'type': 'integer' },
-        'skills': { 'type': 'string' }
+  type: 'object',
+  properties: {
+    approve: { type: 'boolean', output: true },
+    candidate: {
+      type: 'object',
+      properties: {
+        email: { type: 'string' },
+        name: { type: 'string' },
+        salary: { type: 'integer' },
+        skills: { type: 'string' }
       },
-      'input': true
+      input: true
     }
   },
   phases: ['complete', 'start', 'claim', 'release']
-};
\ No newline at end of file
+};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_HRInterview.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_HRInterview.html
index 19ce83fe18..dd7f83acc0 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_HRInterview.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_HRInterview.html
@@ -1,56 +1,110 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <div>
-	<fieldset >
-		<legend>Candidate</legend>
-		<div>
-			<div class="form-group">
-				<label for="candidate.email">Email</label>
-				<input type="text" id="candidate.email" name="candidate.email" class="form-control"  value="" />
-			</div>
-			<div class="form-group">
-				<label for="candidate.name">Name</label>
-				<input type="text" id="candidate.name" name="candidate.name" class="form-control"  value="" />
-			</div>
-			<div class="form-group">
-				<label for="candidate.salary">Salary</label>
-				<input type="number" class="form-control" id="candidate.salary" name="candidate.salary"  step="1" value="" />
-			</div>
-			<div class="form-group">
-				<label for="candidate.skills">Skills</label>
-				<input type="text" id="candidate.skills" name="candidate.skills" class="form-control"  value="" />
-			</div>
-		</div>
-	</fieldset>
-	<div class="form-check">
-		<input type="checkbox" id="approve" name="approve" class="form-check-input" />
-		<label class="form-check-label" for="approve">Approve</label>
-	</div>
-	<script>
-		/* Utility function that fills the form with the data received from the kogito runtime */
-		function setFormData(data) {
-			if (!data) {
-				return;
-			}
-			document.getElementById("candidate.email").value = data?.candidate?.email ?? "";
-			document.getElementById("candidate.name").value = data?.candidate?.name ?? "";
-			document.getElementById("candidate.salary").value = data?.candidate?.salary ?? "";
-			document.getElementById("candidate.skills").value = data?.candidate?.skills ?? "";
-			document.getElementById("approve").checked = data?.approve;
-		}
-		/* Utility function to generate the expected form output as a json object */
-		function getFormData() {
-			const formData = {};
-			formData.approve = document.getElementById("approve").checked;
-			return formData;
-		}
-		/* Utility function to validate the form on the 'beforeSubmit' Lifecycle Hook */
-		function validateForm() {
-			const salary = document.getElementById('candidate.salary').value;
-			if( salary> 1000000) {
-				document.getElementById('candidate.salary').classList.add('is-invalid')
-				throw new Error('Salary too high')
-			}
-		}
-		/*
+  <fieldset>
+    <legend>Candidate</legend>
+    <div>
+      <div class="form-group">
+        <label for="candidate.email">Email</label>
+        <input
+          type="text"
+          id="candidate.email"
+          name="candidate.email"
+          class="form-control"
+          value=""
+        />
+      </div>
+      <div class="form-group">
+        <label for="candidate.name">Name</label>
+        <input
+          type="text"
+          id="candidate.name"
+          name="candidate.name"
+          class="form-control"
+          value=""
+        />
+      </div>
+      <div class="form-group">
+        <label for="candidate.salary">Salary</label>
+        <input
+          type="number"
+          class="form-control"
+          id="candidate.salary"
+          name="candidate.salary"
+          step="1"
+          value=""
+        />
+      </div>
+      <div class="form-group">
+        <label for="candidate.skills">Skills</label>
+        <input
+          type="text"
+          id="candidate.skills"
+          name="candidate.skills"
+          class="form-control"
+          value=""
+        />
+      </div>
+    </div>
+  </fieldset>
+  <div class="form-check">
+    <input
+      type="checkbox"
+      id="approve"
+      name="approve"
+      class="form-check-input"
+    />
+    <label class="form-check-label" for="approve">Approve</label>
+  </div>
+  <script>
+    /* Utility function that fills the form with the data received from the kogito runtime */
+    function setFormData(data) {
+      if (!data) {
+        return;
+      }
+      document.getElementById('candidate.email').value =
+        data?.candidate?.email ?? '';
+      document.getElementById('candidate.name').value =
+        data?.candidate?.name ?? '';
+      document.getElementById('candidate.salary').value =
+        data?.candidate?.salary ?? '';
+      document.getElementById('candidate.skills').value =
+        data?.candidate?.skills ?? '';
+      document.getElementById('approve').checked = data?.approve;
+    }
+    /* Utility function to generate the expected form output as a json object */
+    function getFormData() {
+      const formData = {};
+      formData.approve = document.getElementById('approve').checked;
+      return formData;
+    }
+    /* Utility function to validate the form on the 'beforeSubmit' Lifecycle Hook */
+    function validateForm() {
+      const salary = document.getElementById('candidate.salary').value;
+      if (salary > 1000000) {
+        document.getElementById('candidate.salary').classList.add('is-invalid');
+        throw new Error('Salary too high');
+      }
+    }
+    /*
             Call to the Kogito console form engine. It will establish the connection with the console embeding the form
             and return an instance of FormAPI that will allow hook custom code into the form lifecycle.
             The `window.Form.openForm` call expects an object with the following entries:
@@ -59,22 +113,22 @@
                     - data: the data to be bound into the form
                     - ctx: info about the context where the form is being displayed. This will contain information such as the form JSON Schema, process/task, user...
         */
-		const formApi = window.Form.openForm({
-			onOpen: (data, context) => setFormData(data),
-		});
-		/*
+    const formApi = window.Form.openForm({
+      onOpen: (data, context) => setFormData(data)
+    });
+    /*
             Form Lifecycle Hook that will be executed before the form is submitted.
             Throwing an error will stop the form submit. Usually should be used to validate the form.
         */
-		formApi.beforeSubmit = () => validateForm();
-		/*
+    formApi.beforeSubmit = () => validateForm();
+    /*
             Form Lifecycle Hook that will be executed after the form is submitted.
             It will receive a response object containing the `type` flag indicating if the submit has been successful and `info` with extra information about the submit result.
         */
-		formApi.afterSubmit = (response) => {
-			alert(response.type + ': ' + response.info)
-		};
-		/* Generates the expected form output object to be posted */
-		formApi.getFormData = () => getFormData();
-	</script>
+    formApi.afterSubmit = (response) => {
+      alert(response.type + ': ' + response.info);
+    };
+    /* Generates the expected form output object to be posted */
+    formApi.getFormData = () => getFormData();
+  </script>
 </div>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_ITInterview.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_ITInterview.html
index a962d54161..3713fef88f 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_ITInterview.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/html_hiring_ITInterview.html
@@ -1,50 +1,108 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <div>
-	<div class="form-check">
-		<input type="checkbox" id="approve" name="approve" class="form-check-input" />
-		<label class="form-check-label" for="approve">Approve</label>
-	</div>
-	<fieldset disabled>
-		<legend>Candidate</legend>
-		<div>
-			<div class="form-group">
-				<label for="candidate.email">Email</label>
-				<input type="text" id="candidate.email" name="candidate.email" class="form-control" disabled value="" />
-			</div>
-			<div class="form-group">
-				<label for="candidate.name">Name</label>
-				<input type="text" id="candidate.name" name="candidate.name" class="form-control" disabled value="" />
-			</div>
-			<div class="form-group">
-				<label for="candidate.salary">Salary</label>
-				<input type="number" class="form-control" id="candidate.salary" name="candidate.salary" disabled step="1" value="" />
-			</div>
-			<div class="form-group">
-				<label for="candidate.skills">Skills</label>
-				<input type="text" id="candidate.skills" name="candidate.skills" class="form-control" disabled value="" />
-			</div>
-		</div>
-	</fieldset>
-	<script>
-		/* Utility function that fills the form with the data received from the kogito runtime */
-		function setFormData(data) {
-			if (!data) {
-				return;
-			}
-			document.getElementById("approve").checked = data?.approve;
-			document.getElementById("candidate.email").value = data?.candidate?.email ?? "";
-			document.getElementById("candidate.name").value = data?.candidate?.name ?? "";
-			document.getElementById("candidate.salary").value = data?.candidate?.salary ?? "";
-			document.getElementById("candidate.skills").value = data?.candidate?.skills ?? "";
-		}
-		/* Utility function to generate the expected form output as a json object */
-		function getFormData() {
-			const formData = {};
-			formData.approve = document.getElementById("approve").checked;
-			return formData;
-		}
-		/* Utility function to validate the form on the 'beforeSubmit' Lifecycle Hook */
-		function validateForm() {}
-		/*
+  <div class="form-check">
+    <input
+      type="checkbox"
+      id="approve"
+      name="approve"
+      class="form-check-input"
+    />
+    <label class="form-check-label" for="approve">Approve</label>
+  </div>
+  <fieldset disabled>
+    <legend>Candidate</legend>
+    <div>
+      <div class="form-group">
+        <label for="candidate.email">Email</label>
+        <input
+          type="text"
+          id="candidate.email"
+          name="candidate.email"
+          class="form-control"
+          disabled
+          value=""
+        />
+      </div>
+      <div class="form-group">
+        <label for="candidate.name">Name</label>
+        <input
+          type="text"
+          id="candidate.name"
+          name="candidate.name"
+          class="form-control"
+          disabled
+          value=""
+        />
+      </div>
+      <div class="form-group">
+        <label for="candidate.salary">Salary</label>
+        <input
+          type="number"
+          class="form-control"
+          id="candidate.salary"
+          name="candidate.salary"
+          disabled
+          step="1"
+          value=""
+        />
+      </div>
+      <div class="form-group">
+        <label for="candidate.skills">Skills</label>
+        <input
+          type="text"
+          id="candidate.skills"
+          name="candidate.skills"
+          class="form-control"
+          disabled
+          value=""
+        />
+      </div>
+    </div>
+  </fieldset>
+  <script>
+    /* Utility function that fills the form with the data received from the kogito runtime */
+    function setFormData(data) {
+      if (!data) {
+        return;
+      }
+      document.getElementById('approve').checked = data?.approve;
+      document.getElementById('candidate.email').value =
+        data?.candidate?.email ?? '';
+      document.getElementById('candidate.name').value =
+        data?.candidate?.name ?? '';
+      document.getElementById('candidate.salary').value =
+        data?.candidate?.salary ?? '';
+      document.getElementById('candidate.skills').value =
+        data?.candidate?.skills ?? '';
+    }
+    /* Utility function to generate the expected form output as a json object */
+    function getFormData() {
+      const formData = {};
+      formData.approve = document.getElementById('approve').checked;
+      return formData;
+    }
+    /* Utility function to validate the form on the 'beforeSubmit' Lifecycle Hook */
+    function validateForm() {}
+    /*
             Call to the Kogito console form engine. It will establish the connection with the console embeding the form
             and return an instance of FormAPI that will allow hook custom code into the form lifecycle.
             The `window.Form.openForm` call expects an object with the following entries:
@@ -53,20 +111,20 @@
                     - data: the data to be bound into the form
                     - ctx: info about the context where the form is being displayed. This will contain information such as the form JSON Schema, process/task, user...
         */
-		const formApi = window.Form.openForm({
-			onOpen: (data, context) => setFormData(data),
-		});
-		/*
+    const formApi = window.Form.openForm({
+      onOpen: (data, context) => setFormData(data)
+    });
+    /*
             Form Lifecycle Hook that will be executed before the form is submitted.
             Throwing an error will stop the form submit. Usually should be used to validate the form.
         */
-		formApi.beforeSubmit = () => validateForm();
-		/*
+    formApi.beforeSubmit = () => validateForm();
+    /*
             Form Lifecycle Hook that will be executed after the form is submitted.
             It will receive a response object containing the `type` flag indicating if the submit has been successful and `info` with extra information about the submit result.
         */
-		formApi.afterSubmit = (response) => {};
-		/* Generates the expected form output object to be posted */
-		formApi.getFormData = () => getFormData();
-	</script>
+    formApi.afterSubmit = (response) => {};
+    /* Generates the expected form output object to be posted */
+    formApi.getFormData = () => getFormData();
+  </script>
 </div>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_HRInterview.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_HRInterview.tsx
index a14e67044e..cc100e4bf3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_HRInterview.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_HRInterview.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useCallback, useEffect, useState } from 'react';
 import {
   Card,
@@ -16,7 +34,7 @@ const Form__hiring_HRInterview: React.FC<any> = (props: any) => {
   const [approve, set__approve] = useState<boolean>(false);
 
   /* Utility function that fills the form with the data received from the kogito runtime */
-  const setFormData = data => {
+  const setFormData = (data) => {
     if (!data) {
       return;
     }
@@ -42,7 +60,7 @@ const Form__hiring_HRInterview: React.FC<any> = (props: any) => {
   }, [candidate__salary]);
 
   /* Utility function to perform actions on the on the 'afterSubmit' Lifecycle Hook */
-  const afterSubmit = useCallback(result => {}, []);
+  const afterSubmit = useCallback((result) => {}, []);
 
   useEffect(() => {
     if (formApi) {
@@ -55,7 +73,7 @@ const Form__hiring_HRInterview: React.FC<any> = (props: any) => {
         Form Lifecycle Hook that will be executed after the form is submitted.
         It will receive a response object containing the `type` flag indicating if the submit has been successful and `info` with extra information about the submit result.
       */
-      formApi.afterSubmit = result => afterSubmit(result);
+      formApi.afterSubmit = (result) => afterSubmit(result);
       /* Generates the expected form output object to be posted */
       formApi.getFormData = () => getFormData();
     }
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_ITInterview.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_ITInterview.tsx
index fe7b84dcac..cf1de63c5e 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_ITInterview.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/examples/react_hiring_ITInterview.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useCallback, useEffect, useState } from 'react';
 import {
   Card,
@@ -15,7 +33,7 @@ const Form__hiring_ITInterview: React.FC<any> = (props: any) => {
   const [candidate__salary, set__candidate__salary] = useState<number>('');
   const [candidate__skills, set__candidate__skills] = useState<string>('');
   /* Utility function that fills the form with the data received from the kogito runtime */
-  const setFormData = data => {
+  const setFormData = (data) => {
     if (!data) {
       return;
     }
@@ -34,7 +52,7 @@ const Form__hiring_ITInterview: React.FC<any> = (props: any) => {
   /* Utility function to validate the form on the 'beforeSubmit' Lifecycle Hook */
   const validateForm = useCallback(() => {}, []);
   /* Utility function to perform actions on the on the 'afterSubmit' Lifecycle Hook */
-  const afterSubmit = useCallback(result => {}, []);
+  const afterSubmit = useCallback((result) => {}, []);
   useEffect(() => {
     if (formApi) {
       /*
@@ -46,7 +64,7 @@ const Form__hiring_ITInterview: React.FC<any> = (props: any) => {
         Form Lifecycle Hook that will be executed after the form is submitted.
         It will receive a response object containing the `type` flag indicating if the submit has been successful and `info` with extra information about the submit result.
       */
-      formApi.afterSubmit = result => afterSubmit(result);
+      formApi.afterSubmit = (result) => afterSubmit(result);
       /* Generates the expected form output object to be posted */
       formApi.getFormData = () => getFormData();
     }
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/formData.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/formData.js
index e25c93696d..562eddbf53 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/formData.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/forms/formData.js
@@ -1,22 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = [
-    {
-        name: 'html_hiring_HRInterview',
-        type: 'HTML',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    },
-    {
-        name: 'html_hiring_ITInterview',
-        type: 'HTML',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    },
-    {
-        name: 'react_hiring_HRInterview',
-        type: 'TSX',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    },
-    {
-        name: 'react_hiring_ITInterview',
-        type: 'TSX',
-        lastModified: new Date('2021-08-23T13:26:02.13Z')
-    },
-]
\ No newline at end of file
+  {
+    name: 'html_hiring_HRInterview',
+    type: 'HTML',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  },
+  {
+    name: 'html_hiring_ITInterview',
+    type: 'HTML',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  },
+  {
+    name: 'react_hiring_HRInterview',
+    type: 'TSX',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  },
+  {
+    name: 'react_hiring_ITInterview',
+    type: 'TSX',
+    lastModified: new Date('2021-08-23T13:26:02.13Z')
+  }
+];
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/graphql.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/graphql.js
index 2e3370d761..6df5365223 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/graphql.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/graphql.js
@@ -1,4142 +1,4199 @@
-module.exports ={ ProcessInstanceData : [
-  {
-    id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
-    processId: 'hotelBooking',
-    businessKey: 'T1234HotelBooking01',
-    parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    parentProcessInstance: {
-      id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-      processName: 'travels',
-      businessKey: 'T1234'
-    },
-    processName: 'HotelBooking',
-    rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    roles: [],
-    state: 'COMPLETED',
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578e904e6b',
-      message: 'some thing went wrong'
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = {
+  ProcessInstanceData: [
+    {
+      id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
+      processId: 'hotelBooking',
+      businessKey: 'T1234HotelBooking01',
+      parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      parentProcessInstance: {
+        id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+        processName: 'travels',
+        businessKey: 'T1234'
+      },
+      processName: 'HotelBooking',
+      rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      roles: [],
+      state: 'COMPLETED',
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578e904e6b',
+        message: 'some thing went wrong'
+      },
+      addons: [],
+      variables:
+        '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '27107f38-d888-4edf-9a4f-11b9e6d751b6',
+          enter: '2019-10-22T03:37:30.798Z',
+          exit: '2019-10-22T03:37:30.798Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: '41b3f49e-beb3-4b5f-8130-efd28f82b971',
+          enter: '2019-10-22T03:37:30.795Z',
+          exit: '2019-10-22T03:37:30.798Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '2',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '4165a571-2c79-4fd0-921e-c6d5e7851b67',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.795Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: []
     },
-    addons: [],
-    variables:
-      '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '27107f38-d888-4edf-9a4f-11b9e6d751b6',
-        enter: '2019-10-22T03:37:30.798Z',
-        exit: '2019-10-22T03:37:30.798Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: '41b3f49e-beb3-4b5f-8130-efd28f82b971',
-        enter: '2019-10-22T03:37:30.795Z',
-        exit: '2019-10-22T03:37:30.798Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '2',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '4165a571-2c79-4fd0-921e-c6d5e7851b67',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.795Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
+    {
+      id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
+      processId: 'flightBooking',
+      businessKey: 'T1234FlightBooking01',
+      parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      parentProcessInstance: {
+        id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+        processName: 'travels',
+        businessKey: 'T1234'
       },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
-    processId: 'flightBooking',
-    businessKey: 'T1234FlightBooking01',
-    parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    parentProcessInstance: {
-      id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-      processName: 'travels',
-      businessKey: 'T1234'
-    },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    roles: [],
-    state: 'ERROR',
-    addons: ['jobs-management', 'prometheus-monitoring'],
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    error: {
-      nodeDefinitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
-      message:
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+      processName: 'FlightBooking',
+      rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      roles: [],
+      state: 'ERROR',
+      addons: ['jobs-management', 'prometheus-monitoring'],
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      error: {
+        nodeDefinitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
+        message:
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'e6c20-02c2-4c2b-8c5c-e988a0adf87c',
+          id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
+          id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75ze6',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75a56',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75q76',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: []
     },
-    start: '2019-10-22T03:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'e6c20-02c2-4c2b-8c5c-e988a0adf87c',
-        id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'EndNode'
+    {
+      id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
+      processId: 'flightBooking',
+      businessKey: 'T1234FlightBooking02',
+      parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      parentProcessInstance: {
+        id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+        processName: 'travels',
+        businessKey: 'T1234'
       },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: '_a23e6c20-02c2-4c2b-8c5c-e988a0adf87c',
-        id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75ze6',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75a56',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75q76',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
-    processId: 'flightBooking',
-    businessKey: 'T1234FlightBooking02',
-    parentProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    parentProcessInstance: {
+      processName: 'FlightBooking',
+      rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      endpoint: 'http://localhost:4000',
+      error: {
+        nodeDefinitionId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf823',
+        message: 'some thing went wrong'
+      },
+      addons: [],
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
+          enter: '2019-10-22T03:37:30.804Z',
+          exit: '2019-10-22T03:37:30.804Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d751g6',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75v36',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75o96',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: []
+    },
+    {
       id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      processId: 'travels',
+      businessKey: 'T1234',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: 'T1234'
+      roles: [],
+      state: 'ERROR',
+      rootProcessInstanceId: null,
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
+          enter: '2019-10-22T03:37:38.586Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
+          enter: '2019-10-22T03:37:30.807Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '4',
+          name: 'Join',
+          definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+          id: '08c153e8-2766-4675-81f7-29943efdf411',
+          enter: '2019-10-22T03:37:30.806Z',
+          exit: '2019-10-22T03:37:30.807Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
+          enter: '2019-10-22T03:37:30.803Z',
+          exit: '2019-10-22T03:37:30.806Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '415a52c0-dc1f-4a93-9238-862dc8072262',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: '52d64298-3f28-4aba-a812-dba4077c9665',
+          enter: '2019-10-22T03:37:30.79Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
+          enter: '2019-10-22T03:37:30.755Z',
+          exit: '2019-10-22T03:37:30.79Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
+          enter: '2019-10-22T03:37:30.753Z',
+          exit: '2019-10-22T03:37:30.754Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m26',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75uu26',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75mi86',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        }
+      ],
+      childProcessInstances: [
+        {
+          id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
+          processName: 'FlightBooking',
+          businessKey: 'T1234FlightBooking02'
+        },
+        {
+          id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
+          processName: 'HotelBooking',
+          businessKey: 'T1234HotelBooking01'
+        },
+        {
+          id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
+          processName: 'FlightBooking',
+          businessKey: 'T1234FlightBooking01'
+        }
+      ]
     },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    endpoint: 'http://localhost:4000',
-    error: {
-      nodeDefinitionId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf823',
-      message: 'some thing went wrong'
+
+    {
+      id: 'tEE12-fo54-l665-mp112-akou112345566',
+      processId: 'travels',
+      businessKey: 'TEE12',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      state: 'ERROR',
+      rootProcessInstanceId: null,
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
+          enter: '2019-10-22T03:37:38.586Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
+          enter: '2019-10-22T03:37:30.807Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '4',
+          name: 'Join',
+          definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+          id: '08c153e8-2766-4675-81f7-29943efdf411',
+          enter: '2019-10-22T03:37:30.806Z',
+          exit: '2019-10-22T03:37:30.807Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
+          enter: '2019-10-22T03:37:30.803Z',
+          exit: '2019-10-22T03:37:30.806Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '415a52c0-dc1f-4a93-9238-862dc8072262',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: '52d64298-3f28-4aba-a812-dba4077c9665',
+          enter: '2019-10-22T03:37:30.79Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
+          enter: '2019-10-22T03:37:30.755Z',
+          exit: '2019-10-22T03:37:30.79Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
+          enter: '2019-10-22T03:37:30.753Z',
+          exit: '2019-10-22T03:37:30.754Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    addons: [],
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '8ac1fc9d-6de2-4b23-864e-ba79315db317',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2efa0617-d155-44dc-9b1e-38efc0dcec02',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '849d5bf2-4032-4897-8b30-179ce9d3444b',
-        enter: '2019-10-22T03:37:30.804Z',
-        exit: '2019-10-22T03:37:30.804Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d751g6',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75v36',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75o96',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-    processId: 'travels',
-    businessKey: 'T1234',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ERROR',
-    rootProcessInstanceId: null,
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-      message: 'Something went wrong'
+    {
+      id: 'RZ11-tu77-hj321-bnfhe1-xdr2134',
+      processId: 'travels',
+      businessKey: 'MPTQ',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      state: 'ERROR',
+      rootProcessInstanceId: null,
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
+          enter: '2019-10-22T03:37:38.586Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
+          enter: '2019-10-22T03:37:30.807Z',
+          exit: '2019-10-22T03:37:38.586Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
+          enter: '2019-10-22T03:37:30.793Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '4',
+          name: 'Join',
+          definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
+          id: '08c153e8-2766-4675-81f7-29943efdf411',
+          enter: '2019-10-22T03:37:30.806Z',
+          exit: '2019-10-22T03:37:30.807Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
+          enter: '2019-10-22T03:37:30.803Z',
+          exit: '2019-10-22T03:37:30.806Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.803Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '415a52c0-dc1f-4a93-9238-862dc8072262',
+          enter: '2019-10-22T03:37:30.792Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: '52d64298-3f28-4aba-a812-dba4077c9665',
+          enter: '2019-10-22T03:37:30.79Z',
+          exit: '2019-10-22T03:37:30.792Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
+          enter: '2019-10-22T03:37:30.755Z',
+          exit: '2019-10-22T03:37:30.79Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
+          enter: '2019-10-22T03:37:30.753Z',
+          exit: '2019-10-22T03:37:30.754Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: "http://localhost:4000",
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
-        enter: '2019-10-22T03:37:38.586Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
-        enter: '2019-10-22T03:37:30.807Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '4',
-        name: 'Join',
-        definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-        id: '08c153e8-2766-4675-81f7-29943efdf411',
-        enter: '2019-10-22T03:37:30.806Z',
-        exit: '2019-10-22T03:37:30.807Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
-        enter: '2019-10-22T03:37:30.803Z',
-        exit: '2019-10-22T03:37:30.806Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '415a52c0-dc1f-4a93-9238-862dc8072262',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: '52d64298-3f28-4aba-a812-dba4077c9665',
-        enter: '2019-10-22T03:37:30.79Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
-        enter: '2019-10-22T03:37:30.755Z',
-        exit: '2019-10-22T03:37:30.79Z',
-        type: 'RuleSetNode'
+    {
+      id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
+      processId: 'flightBooking',
+      businessKey: 'Tra234FlightBooking01',
+      parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      parentProcessInstance: {
+        id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+        processName: 'travels',
+        businessKey: 'Tra234'
       },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
-        enter: '2019-10-22T03:37:30.753Z',
-        exit: '2019-10-22T03:37:30.754Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m26',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75uu26',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75mi86',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-    ],
-    childProcessInstances: [
-      {
-        id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf862',
-        processName: 'FlightBooking',
-        businessKey: 'T1234FlightBooking02'
-      },
-      {
-        id: 'a1e139d5-4e77-48c9-84ae-34578e904e5a',
-        processName: 'HotelBooking',
-        businessKey: 'T1234HotelBooking01'
-      },
-      {
-        id: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
-        processName: 'FlightBooking',
-        businessKey: 'T1234FlightBooking01'
-      }
-    ]
-  },
-
-  {
-    id: 'tEE12-fo54-l665-mp112-akou112345566',
-    processId: 'travels',
-    businessKey: 'TEE12',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ERROR',
-    rootProcessInstanceId: null,
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-      message: 'Something went wrong'
+      processName: 'FlightBooking',
+      rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      roles: [],
+      state: 'ERROR',
+      addons: ['prometheus-monitoring'],
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
+        message:
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+      },
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '18d9e3df-22d2-429c-98d7-f4f2a7b1b471',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.086Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
+          id: '8a533611-9766-428f-b7ff-78156fc4851d',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.086Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '2f423120-13ea-4277-97f6-6b7a4b4630d0',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.086Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
-        enter: '2019-10-22T03:37:38.586Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
-        enter: '2019-10-22T03:37:30.807Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '4',
-        name: 'Join',
-        definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-        id: '08c153e8-2766-4675-81f7-29943efdf411',
-        enter: '2019-10-22T03:37:30.806Z',
-        exit: '2019-10-22T03:37:30.807Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
-        enter: '2019-10-22T03:37:30.803Z',
-        exit: '2019-10-22T03:37:30.806Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '415a52c0-dc1f-4a93-9238-862dc8072262',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: '52d64298-3f28-4aba-a812-dba4077c9665',
-        enter: '2019-10-22T03:37:30.79Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
-        enter: '2019-10-22T03:37:30.755Z',
-        exit: '2019-10-22T03:37:30.79Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
-        enter: '2019-10-22T03:37:30.753Z',
-        exit: '2019-10-22T03:37:30.754Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'RZ11-tu77-hj321-bnfhe1-xdr2134',
-    processId: 'travels',
-    businessKey: 'MPTQ',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ERROR',
-    rootProcessInstanceId: null,
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-      message: 'Something went wrong'
+    {
+      id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
+      processId: 'hotelBooking',
+      businessKey: 'Tra234HotelBooking01',
+      parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      parentProcessInstance: {
+        id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+        processName: 'travels',
+        businessKey: 'Tra234'
+      },
+      rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      processName: 'HotelBooking',
+      roles: [],
+      state: 'ABORTED',
+      addons: ['process-management'],
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578ek1839b',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: 'ed36cd72-5e52-4a53-9d0d-865c98781282',
+          enter: '2019-10-22T03:40:44.088Z',
+          exit: '2019-10-22T03:40:44.088Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: '040cd02a-7f4c-4d41-bda5-4889f82e921f',
+          enter: '2019-10-22T03:40:44.088Z',
+          exit: '2019-10-22T03:40:44.088Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '8528c7bf-8ac8-401f-b7e5-6f3e69b9f9f2',
+          enter: '2019-10-22T03:40:44.088Z',
+          exit: '2019-10-22T03:40:44.088Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Bangalore","country":"India","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Bangalore","country":"India","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Bangalore","country":"US","street":"Bangalore","zipCode":"560093"},"email":"ajaganat@redhat.com","firstName":"Ajay","lastName":"Jaganathan","nationality":"US"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '870bdda0-be04-4e59-bb0b-f9b665eaacc9',
-        enter: '2019-10-22T03:37:38.586Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '6b4a4fe9-4aab-4e8c-bb79-27b8b6b88d1f',
-        enter: '2019-10-22T03:37:30.807Z',
-        exit: '2019-10-22T03:37:38.586Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'dd33de7c-c39c-484a-83a8-3e1b007fce95',
-        enter: '2019-10-22T03:37:30.793Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '4',
-        name: 'Join',
-        definitionId: '_2140F05A-364F-40B3-BB7B-B12927065DF8',
-        id: '08c153e8-2766-4675-81f7-29943efdf411',
-        enter: '2019-10-22T03:37:30.806Z',
-        exit: '2019-10-22T03:37:30.807Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '683cf307-f082-4a8e-9c85-d5a11b13903a',
-        enter: '2019-10-22T03:37:30.803Z',
-        exit: '2019-10-22T03:37:30.806Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'cf057e58-4113-46c0-be13-6de42ea8377e',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.803Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '415a52c0-dc1f-4a93-9238-862dc8072262',
-        enter: '2019-10-22T03:37:30.792Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: '52d64298-3f28-4aba-a812-dba4077c9665',
-        enter: '2019-10-22T03:37:30.79Z',
-        exit: '2019-10-22T03:37:30.792Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '6fdee287-08f6-49c2-af2d-2d125ba76ab7',
-        enter: '2019-10-22T03:37:30.755Z',
-        exit: '2019-10-22T03:37:30.79Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: 'd98c1762-9d3c-4228-9ffc-bc3f423079c0',
-        enter: '2019-10-22T03:37:30.753Z',
-        exit: '2019-10-22T03:37:30.754Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
-    processId: 'flightBooking',
-    businessKey: 'Tra234FlightBooking01',
-    parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    parentProcessInstance: {
+    {
       id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+      processId: 'travels',
+      businessKey: 'Tra234',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: 'Tra234'
+      rootProcessInstanceId: null,
+      roles: [],
+      state: 'ERROR',
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      start: '2019-10-22T03:40:44.089Z',
+      error: {
+        nodeDefinitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
+        message: 'Something went wrong'
+      },
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Confirm travel',
+          definitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
+          id: '69e0a0f5-2360-4174-a8f8-a892a31fc2f9',
+          enter: '2019-10-22T03:40:44.089Z',
+          exit: '2019-10-22T04:42:07.246Z',
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '4cb855b9-e3e4-488d-ae1a-9ea3b8490dba',
+          enter: '2019-10-22T03:40:44.086Z',
+          exit: '2019-10-22T03:40:44.087Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: '1da9af80-c70e-47b8-9c87-964468fc0b46',
+          enter: '2019-10-22T03:40:44.089Z',
+          exit: '2019-10-22T03:40:44.089Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: 'f9b90c32-51da-4986-9603-8c800a6b71b1',
+          enter: '2019-10-22T03:40:44.087Z',
+          exit: '2019-10-22T03:40:44.089Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'f8d7fe9e-0f3e-4919-8fa7-82e0b6821aa9',
+          enter: '2019-10-22T03:40:44.085Z',
+          exit: '2019-10-22T03:40:44.087Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: '55fd6d56-e4d4-4021-b6c6-02c3c5cb86ce',
+          enter: '2019-10-22T03:40:44.085Z',
+          exit: '2019-10-22T03:40:44.085Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'fe6b2d9e-6cfd-415a-8e92-5d2be541c3ff',
+          enter: '2019-10-22T03:40:44.085Z',
+          exit: '2019-10-22T03:40:44.085Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '3bd30bf9-96ba-4f5d-9ed0-981963288418',
+          enter: '2019-10-22T03:40:44.07Z',
+          exit: '2019-10-22T03:40:44.085Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '739fc473-157d-4b4e-8ad6-e4c28499d24e',
+          enter: '2019-10-22T03:40:44.07Z',
+          exit: '2019-10-22T03:40:44.07Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
+          processName: 'FlightBooking',
+          businessKey: 'Tra234FlightBooking01'
+        },
+        {
+          id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
+          processName: 'HotelBooking',
+          businessKey: 'Tra234HotelBooking01'
+        }
+      ]
     },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    roles: [],
-    state: 'ERROR',
-    addons: ['prometheus-monitoring'],
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
-      message:
-        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim idest laborum.'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '18d9e3df-22d2-429c-98d7-f4f2a7b1b471',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.086Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: '_cq125e139d5-4e77-48c9-84ae-34578e90433n',
-        id: '8a533611-9766-428f-b7ff-78156fc4851d',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.086Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '2f423120-13ea-4277-97f6-6b7a4b4630d0',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.086Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
-    processId: 'hotelBooking',
-    businessKey: 'Tra234HotelBooking01',
-    parentProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    parentProcessInstance: {
-      id: '538f9feb-5a14-4096-b791-2055b38da7c6',
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop',
+      processId: 'travels',
+      businessKey: 'Tr1122',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: 'Tra234'
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-12-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel not found',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
+          name: 'Manager decision',
+          status: 'COMPLETED'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
+          name: 'Milestone 1: Order placed',
+          status: 'ACTIVE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
+          name: 'Milestone 2: Order shipped',
+          status: 'AVAILABLE'
+        },
+        {
+          id: '27107f38-d888-4edf-9a4f-11b9e6d75m88',
+          name: 'Milestone 3: Order delivered and closed with customer sign off',
+          status: 'ACTIVE'
+        }
+      ],
+      childProcessInstances: []
     },
-    rootProcessInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    processName: 'HotelBooking',
-    roles: [],
-    state: 'ABORTED',
-    addons: ['process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-34578ek1839b',
-      message: 'Something went wrong'
+    {
+      id: 'e735128t-6tt7-4aa8-9ec0-e18e19809e0b',
+      processId: 'travels',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels',
+      roles: [],
+      businessKey: null,
+      state: 'COMPLETED',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-12-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: 'ed36cd72-5e52-4a53-9d0d-865c98781282',
-        enter: '2019-10-22T03:40:44.088Z',
-        exit: '2019-10-22T03:40:44.088Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: '040cd02a-7f4c-4d41-bda5-4889f82e921f',
-        enter: '2019-10-22T03:40:44.088Z',
-        exit: '2019-10-22T03:40:44.088Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '8528c7bf-8ac8-401f-b7e5-6f3e69b9f9f2',
-        enter: '2019-10-22T03:40:44.088Z',
-        exit: '2019-10-22T03:40:44.088Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '538f9feb-5a14-4096-b791-2055b38da7c6',
-    processId: 'travels',
-    businessKey: 'Tra234',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    rootProcessInstanceId: null,
-    roles: [],
-    state: 'ERROR',
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    start: '2019-10-22T03:40:44.089Z',
-    error: {
-      nodeDefinitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0bccddee',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      processName: 'travels',
+      roles: [],
+      state: 'SUSPENDED',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [
+        'jobs-management',
+        'prometheus-monitoring',
+        'process-management'
+      ],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-23T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-23T22:00:00Z[UTC]","city":"New York","country":"US","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"New York","country":"US","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Berlin","country":"Germany","street":"Bakers","zipCode":"100200"},"email":"cristiano@redhat.com","firstName":"Cristiano","lastName":"Nicolai","nationality":"German"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Confirm travel',
-        definitionId: '__a1e139d5-4e77-48c9-84ae-34578e9817n',
-        id: '69e0a0f5-2360-4174-a8f8-a892a31fc2f9',
-        enter: '2019-10-22T03:40:44.089Z',
-        exit: '2019-10-22T04:42:07.246Z',
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '4cb855b9-e3e4-488d-ae1a-9ea3b8490dba',
-        enter: '2019-10-22T03:40:44.086Z',
-        exit: '2019-10-22T03:40:44.087Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: '1da9af80-c70e-47b8-9c87-964468fc0b46',
-        enter: '2019-10-22T03:40:44.089Z',
-        exit: '2019-10-22T03:40:44.089Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: 'f9b90c32-51da-4986-9603-8c800a6b71b1',
-        enter: '2019-10-22T03:40:44.087Z',
-        exit: '2019-10-22T03:40:44.089Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'f8d7fe9e-0f3e-4919-8fa7-82e0b6821aa9',
-        enter: '2019-10-22T03:40:44.085Z',
-        exit: '2019-10-22T03:40:44.087Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: '55fd6d56-e4d4-4021-b6c6-02c3c5cb86ce',
-        enter: '2019-10-22T03:40:44.085Z',
-        exit: '2019-10-22T03:40:44.085Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'fe6b2d9e-6cfd-415a-8e92-5d2be541c3ff',
-        enter: '2019-10-22T03:40:44.085Z',
-        exit: '2019-10-22T03:40:44.085Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '3bd30bf9-96ba-4f5d-9ed0-981963288418',
-        enter: '2019-10-22T03:40:44.07Z',
-        exit: '2019-10-22T03:40:44.085Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '739fc473-157d-4b4e-8ad6-e4c28499d24e',
-        enter: '2019-10-22T03:40:44.07Z',
-        exit: '2019-10-22T03:40:44.07Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'fc1b6535-d557-40df-82c8-b425b9dc531b',
-        processName: 'FlightBooking',
-        businessKey: 'Tra234FlightBooking01'
+    {
+      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+      processId: 'flightBooking',
+      businessKey: 'Trrr',
+      parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      parentProcessInstance: {
+        id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+        processName: 'travels',
+        businessKey: null
       },
-      {
-        id: 'ff65b793-bb88-4567-b7e3-73eee35772a4',
-        processName: 'HotelBooking',
-        businessKey: 'Tra234HotelBooking01'
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+      processName: 'FlightBooking',
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2f588da5-a323-4111-9017-3093ef9319d1',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
+          processName: 'FlightBooking test 1',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
+    {
+      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
+      processId: 'flightBooking test1',
+      parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+      parentProcessInstance: {
         id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
         processName: 'FlightBooking',
         businessKey: null
       },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop',
-    processId: 'travels',
-    businessKey: 'Tr1122',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+      businessKey: null,
+      processName: 'FlightBooking test 1',
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      roles: [],
+      state: 'SUSPENDED',
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2f588da5-a323-4111-9017-3093ef9319d1',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
+          processName: 'FlightBooking test 2',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-12-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel not found',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75i86',
-        name: 'Manager decision',
-        status: 'COMPLETED'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m36',
-        name: 'Milestone 1: Order placed',
-        status: 'ACTIVE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m66',
-        name: 'Milestone 2: Order shipped',
-        status: 'AVAILABLE'
-      },
-      {
-        id: '27107f38-d888-4edf-9a4f-11b9e6d75m88',
-        name: 'Milestone 3: Order delivered and closed with customer sign off',
-        status: 'ACTIVE'
+    {
+      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
+      processId: 'flightBooking test2',
+      businessKey: 'TP444',
+      parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
+      parentProcessInstance: {
+        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
+        processName: 'FlightBooking test 1',
+        businessKey: null
       },
-    ],
-    childProcessInstances: []
-  },
-  {
-    id: 'e735128t-6tt7-4aa8-9ec0-e18e19809e0b',
-    processId: 'travels',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    businessKey: null,
-    state: 'COMPLETED',
-    rootProcessInstanceId: null,
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      processName: 'FlightBooking test 2',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book flight',
+          definitionId: 'ServiceTask_1',
+          id: '2f588da5-a323-4111-9017-3093ef9319d1',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
+          enter: '2019-10-22T04:43:01.144Z',
+          exit: '2019-10-22T04:43:01.144Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    start: '2019-12-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
+    {
+      id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+      processId: 'hotelBooking',
+      businessKey: 'TM111',
+      parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      parentProcessInstance: {
+        id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+        processName: 'travels',
+        businessKey: null
       },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0bccddee',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    processName: 'travels',
-    roles: [],
-    state: 'SUSPENDED',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring', 'process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      processName: 'HotelBooking',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: ['jobs-management', 'prometheus-monitoring'],
+      error: {
+        nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7a770672-8493-4566-8288-515c0b5360a8',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-    processId: 'flightBooking',
-    businessKey: "Trrr",
-    parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    parentProcessInstance: {
-      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+      processId: 'travels',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
       processName: 'travels',
-      businessKey: null
+      roles: [],
+      state: 'ABORTED',
+      businessKey: 'TL111',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-12-22T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
+          processName: 'hotelBooking',
+          businessKey: 'Hotel11'
+        }
+      ]
     },
-    processName: 'FlightBooking',
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
-      message: 'Something went wrong'
-    },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2f588da5-a323-4111-9017-3093ef9319d1',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
-        processName: 'FlightBooking test 1',
+    {
+      id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
+      processId: 'hotelBooking',
+      parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+      parentProcessInstance: {
+        id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+        processName: 'travels',
         businessKey: null
-      }
-    ]
-  },
-  {
-    id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
-    processId: 'flightBooking test1',
-    parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-    parentProcessInstance: {
-      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-      processName: 'FlightBooking',
-      businessKey: null
+      },
+      rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
+      processName: 'HotelBooking',
+      businessKey: 'Hotel11',
+      roles: [],
+      state: 'COMPLETED',
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000',
+      addons: ['jobs-management', 'prometheus-monitoring'],
+      error: {
+        nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: '2019-10-22T05:40:44.089Z',
+      variables:
+        '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'End Event 1',
+          definitionId: 'EndEvent_1',
+          id: '7a770672-8493-4566-8288-515c0b5360a8',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'EndNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Book hotel',
+          definitionId: 'ServiceTask_1',
+          id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'WorkItemNode'
+        },
+        {
+          nodeId: '3',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: []
     },
-    businessKey: null,
-    processName: 'FlightBooking test 1',
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    roles: [],
-    state: 'SUSPENDED',
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b1',
+      processId: 'travels',
+      businessKey: 'travels001',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels1',
+      roles: [],
+      state: 'ACTIVE',
+      serviceUrl: 'http://localhost:4000',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2f588da5-a323-4111-9017-3093ef9319d1',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
-        processName: 'FlightBooking test 2',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eajabbcc',
-    processId: 'flightBooking test2',
-    businessKey: "TP444",
-    parentProcessInstanceId: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
-    parentProcessInstance: {
-      id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21eaccd',
-      processName: 'FlightBooking test 1',
-      businessKey: null
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
+      processId: 'travels',
+      businessKey: 'Tp111',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels2',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    processName: 'FlightBooking test 2',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-81c77-48c9-84ae-34578e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3',
+      processId: 'travels',
+      businessKey: 'Travels@123',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels3',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000/',
+      endpoint: 'http://localhost:4000/',
+      addons: ['process-management'],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7244ba1b-75ec-4789-8c65-499a0c5b1a6f',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book flight',
-        definitionId: 'ServiceTask_1',
-        id: '2f588da5-a323-4111-9017-3093ef9319d1',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '6ed7aa17-4bb1-48e3-b34a-5a4c5773dff2',
-        enter: '2019-10-22T04:43:01.144Z',
-        exit: '2019-10-22T04:43:01.144Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-    processId: 'hotelBooking',
-    businessKey: "TM111",
-    parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    parentProcessInstance: {
-      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-      processName: 'travels',
-      businessKey: null
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b4',
+      processId: 'travels',
+      businessKey: 'TTTTT',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels4',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-    processName: 'HotelBooking',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring'],
-    error: {
-      nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b5',
+      processId: 'travels',
+      businessKey: 'Tr11111111',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels5',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7a770672-8493-4566-8288-515c0b5360a8',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
-    processId: 'travels',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels',
-    roles: [],
-    state: 'ABORTED',
-    businessKey: 'TL111',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b6',
+      processId: 'travels',
+      businessKey: 'Trav99',
+      parentProcessInstance: null,
+      parentProcessInstanceId: null,
+      processName: 'travels6',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-12-22T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
-        processName: 'hotelBooking',
-        businessKey: 'Hotel11'
-      }
-    ]
-  },
-  {
-    id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88abc',
-    processId: 'hotelBooking',
-    parentProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
-    parentProcessInstance: {
-      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
-      processName: 'travels',
-      businessKey: null
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b8',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels8',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    rootProcessInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0basadadads',
-    processName: 'HotelBooking',
-    businessKey: 'Hotel11',
-    roles: [],
-    state: 'COMPLETED',
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000',
-    addons: ['jobs-management', 'prometheus-monitoring'],
-    error: {
-      nodeDefinitionId: 'a1qa139d5-4e77-181x8c9-84ae-34578e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b9',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels9',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: '2019-10-22T05:40:44.089Z',
-    variables:
-      '{"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'End Event 1',
-        definitionId: 'EndEvent_1',
-        id: '7a770672-8493-4566-8288-515c0b5360a8',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'EndNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Book hotel',
-        definitionId: 'ServiceTask_1',
-        id: 'f10ed686-84f0-48b6-844e-5cfafa32a7bc',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'WorkItemNode'
-      },
-      {
-        nodeId: '3',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '5a6bd73e-1d3d-43d9-8f27-8081c3014716',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: []
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b1',
-    processId: 'travels',
-    businessKey: 'travels001',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels1',
-    roles: [],
-    state: 'ACTIVE',
-    serviceUrl: 'http://localhost:4000',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b10',
+      processId: 'travels',
+      businessKey: 'newTravels',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels10',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
-    processId: 'travels',
-    businessKey: 'Tp111',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels2',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b11',
+      processId: 'travels',
+      businessKey: 'Trav11test',
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels11',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: 'http://localhost:4000',
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3',
-    processId: 'travels',
-    businessKey: 'Travels@123',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels3',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000/',
-    endpoint: 'http://localhost:4000/',
-    addons: ['process-management'],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b12',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels12',
+      roles: [],
+      state: 'ACTIVE',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b4',
-    processId: 'travels',
-    businessKey: "TTTTT",
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels4',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b13abbccccc',
+      processId: 'travels',
+      businessKey: null,
+      parentProcessInstanceId: null,
+      parentProcessInstance: null,
+      processName: 'travels13',
+      roles: [],
+      state: 'COMPLETED',
+      rootProcessInstanceId: null,
+      serviceUrl: null,
+      endpoint: 'http://localhost:4000/',
+      addons: [],
+      error: {
+        nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
+        message: 'Something went wrong'
+      },
+      start: '2019-10-22T03:40:44.089Z',
+      lastUpdate: '2019-12-25T03:40:44.089Z',
+      end: null,
+      variables:
+        '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
+      nodes: [
+        {
+          nodeId: '1',
+          name: 'Book Flight',
+          definitionId: 'CallActivity_2',
+          id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '2',
+          name: 'Confirm travel',
+          definitionId: 'UserTask_2',
+          id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: null,
+          type: 'HumanTaskNode'
+        },
+        {
+          nodeId: '3',
+          name: 'Join',
+          definitionId: 'ParallelGateway_2',
+          id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+          enter: '2019-10-22T04:43:01.148Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '4',
+          name: 'Book Hotel',
+          definitionId: 'CallActivity_1',
+          id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+          enter: '2019-10-22T04:43:01.146Z',
+          exit: '2019-10-22T04:43:01.148Z',
+          type: 'SubProcessNode'
+        },
+        {
+          nodeId: '5',
+          name: 'Book',
+          definitionId: 'ParallelGateway_1',
+          id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.146Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '6',
+          name: 'Join',
+          definitionId: 'ExclusiveGateway_2',
+          id: 'b2761011-3043-4f48-82bd-1395bf651a91',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Join'
+        },
+        {
+          nodeId: '7',
+          name: 'is visa required',
+          definitionId: 'ExclusiveGateway_1',
+          id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
+          enter: '2019-10-22T04:43:01.143Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'Split'
+        },
+        {
+          nodeId: '8',
+          name: 'Visa check',
+          definitionId: 'BusinessRuleTask_1',
+          id: '1baa5de4-47cc-45a8-8323-005388191e4f',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.143Z',
+          type: 'RuleSetNode'
+        },
+        {
+          nodeId: '9',
+          name: 'StartProcess',
+          definitionId: 'StartEvent_1',
+          id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
+          enter: '2019-10-22T04:43:01.135Z',
+          exit: '2019-10-22T04:43:01.135Z',
+          type: 'StartNode'
+        }
+      ],
+      milestones: [],
+      childProcessInstances: [
+        {
+          id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+          processName: 'FlightBooking',
+          businessKey: null
+        },
+        {
+          id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+          processName: 'HotelBooking',
+          businessKey: null
+        }
+      ]
+    }
+  ],
+  JobsData: [
+    {
+      id: '6e74a570-31c8-4020-bd70-19be2cb625f3_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: null,
+      status: 'EXECUTED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: '0',
+      retries: 1,
+      lastUpdate: '2020-08-27T03:35:50.147Z',
+      expirationTime: null,
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+      executionCounter: 2
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b5',
-    processId: 'travels',
-    businessKey: 'Tr11111111',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels5',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: 'dad3aa88-5c1e-4858-a919-6123c675a0fa_1',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 3,
+      lastUpdate: '2020-07-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+      executionCounter: 6
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b6',
-    processId: 'travels',
-    businessKey: 'Trav99',
-    parentProcessInstance: null,
-    parentProcessInstanceId: null,
-    processName: 'travels6',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '2234dde-npce1-2908-b3131-6123c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'CANCELED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 2,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+      executionCounter: 0
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b8',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels8',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: 'T3113e-vbg43-2234-lo89-cpmw3214ra0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'ERROR',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: 30300,
+      repeatLimit: 3,
+      scheduledId: null,
+      retries: 7,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+      executionCounter: 3
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b9',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels9',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: 'bff4ee-11qw23-6675-po987-qwedfrt45a0fa_5',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'RETRY',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 15,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: 'b2761011-3043-4f48-82bd-1395bf651a91',
+      executionCounter: 2
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b10',
-    processId: 'travels',
-    businessKey: 'newTravels',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels10',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 2,
+      lastUpdate: '2020-06-29T03:35:54.635Z',
+      expirationTime: '2020-08-29T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: null,
+      executionCounter: 0
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b11',
-    processId: 'travels',
-    businessKey: 'Trav11test',
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels11',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl: 'http://localhost:4000',
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: 'dad3aa88-5c1e-4858-a919-uey23c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      rootProcessId: '',
+      status: 'SCHEDULED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 5,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: '08c153e8-2766-4675-81f7-29943efdf411',
+      executionCounter: 0
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b12',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels12',
-    roles: [],
-    state: 'ACTIVE',
-    rootProcessInstanceId: null,
-    serviceUrl:null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: '6e74a570-31c8-4020-bd70-o413be2cb625f3_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: null,
+      status: 'EXECUTED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: '0',
+      retries: 0,
+      lastUpdate: '2020-08-27T03:35:50.147Z',
+      expirationTime: null,
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
+      executionCounter: 5
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  },
-  {
-    id: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b13abbccccc',
-    processId: 'travels',
-    businessKey: null,
-    parentProcessInstanceId: null,
-    parentProcessInstance: null,
-    processName: 'travels13',
-    roles: [],
-    state: 'COMPLETED',
-    rootProcessInstanceId: null,
-    serviceUrl: null,
-    endpoint: 'http://localhost:4000/',
-    addons: [],
-    error: {
-      nodeDefinitionId: 'a1e139d5-4e77-48c9-84ae-3459188e90433n',
-      message: 'Something went wrong'
+    {
+      id: 'dad3aa88-5c1e-4858-a919-61ai21c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 0,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
+      executionCounter: 7
     },
-    start: '2019-10-22T03:40:44.089Z',
-    lastUpdate: '2019-12-25T03:40:44.089Z',
-    end: null,
-    variables:
-      '{"flight":{"arrival":"2019-10-30T22:00:00Z[UTC]","departure":"2019-10-22T22:00:00Z[UTC]","flightNumber":"MX555"},"hotel":{"address":{"city":"Berlin","country":"Germany","street":"street","zipCode":"12345"},"bookingNumber":"XX-012345","name":"Perfect hotel","phone":"09876543"},"trip":{"begin":"2019-10-22T22:00:00Z[UTC]","city":"Berlin","country":"Germany","end":"2019-10-30T22:00:00Z[UTC]","visaRequired":false},"traveller":{"address":{"city":"Karkow","country":"Poland","street":"palna","zipCode":"200300"},"email":"rob@redhat.com","firstName":"Rob","lastName":"Rob","nationality":"Polish"}}',
-    nodes: [
-      {
-        nodeId: '1',
-        name: 'Book Flight',
-        definitionId: 'CallActivity_2',
-        id: '7cdeba99-cd36-4425-980d-e59d44769a3e',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '2',
-        name: 'Confirm travel',
-        definitionId: 'UserTask_2',
-        id: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: null,
-        type: 'HumanTaskNode'
-      },
-      {
-        nodeId: '3',
-        name: 'Join',
-        definitionId: 'ParallelGateway_2',
-        id: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-        enter: '2019-10-22T04:43:01.148Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '4',
-        name: 'Book Hotel',
-        definitionId: 'CallActivity_1',
-        id: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-        enter: '2019-10-22T04:43:01.146Z',
-        exit: '2019-10-22T04:43:01.148Z',
-        type: 'SubProcessNode'
-      },
-      {
-        nodeId: '5',
-        name: 'Book',
-        definitionId: 'ParallelGateway_1',
-        id: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.146Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '6',
-        name: 'Join',
-        definitionId: 'ExclusiveGateway_2',
-        id: 'b2761011-3043-4f48-82bd-1395bf651a91',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Join'
-      },
-      {
-        nodeId: '7',
-        name: 'is visa required',
-        definitionId: 'ExclusiveGateway_1',
-        id: 'a91a2600-d0cd-46ff-a6c6-b3081612d1af',
-        enter: '2019-10-22T04:43:01.143Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'Split'
-      },
-      {
-        nodeId: '8',
-        name: 'Visa check',
-        definitionId: 'BusinessRuleTask_1',
-        id: '1baa5de4-47cc-45a8-8323-005388191e4f',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.143Z',
-        type: 'RuleSetNode'
-      },
-      {
-        nodeId: '9',
-        name: 'StartProcess',
-        definitionId: 'StartEvent_1',
-        id: '90e5a337-1c26-4fcc-8ee2-d20e6ba2a1a3',
-        enter: '2019-10-22T04:43:01.135Z',
-        exit: '2019-10-22T04:43:01.135Z',
-        type: 'StartNode'
-      }
-    ],
-    milestones: [],
-    childProcessInstances: [
-      {
-        id: 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
-        processName: 'FlightBooking',
-        businessKey: null
-      },
-      {
-        id: '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
-        processName: 'HotelBooking',
-        businessKey: null
-      }
-    ]
-  }
-],
-JobsData:[
-  {
-    id: "6e74a570-31c8-4020-bd70-19be2cb625f3_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: null,
-    status: "EXECUTED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: "0",
-    retries: 1,
-    lastUpdate: "2020-08-27T03:35:50.147Z",
-    expirationTime: null,
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-    executionCounter: 2
-  },
-  {
-    id: "dad3aa88-5c1e-4858-a919-6123c675a0fa_1",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "SCHEDULED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 3,
-    lastUpdate: "2020-07-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-    executionCounter: 6
-  },
-  {
-    id: "2234dde-npce1-2908-b3131-6123c675a0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "CANCELED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 2,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-    executionCounter: 0
-  },
-  {
-    id: "T3113e-vbg43-2234-lo89-cpmw3214ra0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "ERROR",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: 30300,
-    repeatLimit: 3,
-    scheduledId: null,
-    retries: 7,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-    executionCounter: 3
-  },
-  {
-    id: "bff4ee-11qw23-6675-po987-qwedfrt45a0fa_5",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "RETRY",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 15,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: 'b2761011-3043-4f48-82bd-1395bf651a91',
-    executionCounter: 2
-  },
-  {
-    id: "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "SCHEDULED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 2,
-    lastUpdate: "2020-06-29T03:35:54.635Z",
-    expirationTime: "2020-08-29T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: null,
-    executionCounter: 0
-  },
-  {
-    id: "dad3aa88-5c1e-4858-a919-uey23c675a0fa_0",
-    processId: "travels",
-    processInstanceId: "e4448857-fa0c-403b-ad69-f0a353458b9d",
-    rootProcessId: "",
-    status: "SCHEDULED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 5,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: '08c153e8-2766-4675-81f7-29943efdf411',
-    executionCounter: 0
-  },
-  {
-    id: "6e74a570-31c8-4020-bd70-o413be2cb625f3_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: null,
-    status: "EXECUTED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/6e74a570-31c8-4020-bd70-19be2cb625f3_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: "0",
-    retries: 0,
-    lastUpdate: "2020-08-27T03:35:50.147Z",
-    expirationTime: null,
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: 'fd2e12d5-6a4b-4c75-9f31-028d3f032a95',
-    executionCounter: 5
-  },
-  {
-    id: "dad3aa88-5c1e-4858-a919-61ai21c675a0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "SCHEDULED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 0,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: '843bd287-fb6e-4ee7-a304-ba9b430e52d8',
-    executionCounter: 7
-  },
-  {
-    id: "2234dde-npce1-2908-b3131-i15333c675a0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "CANCELED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 0,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
-    executionCounter: 3
-  },
-  {
-    id: "T3113e-vbg43-2234-lo89-u8103214ra0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "ERROR",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: 30300,
-    repeatLimit: 3,
-    scheduledId: null,
-    retries: 0,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
-    executionCounter: 2
-  },
-  {
-    id: "bff4ee-11qw23-6675-po987-qwedfrt45a0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "RETRY",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 0,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: 'b2761011-3043-4f48-82bd-1395bf651a91',
-    executionCounter: 9
-  },
-  {
-    id: "eff4ee-11qw23-6675-pokau97-ql10s5ut45a0fa_0",
-    processId: "travels",
-    processInstanceId: "8035b580-6ae4-4aa8-9ec0-e18e19809e0b",
-    rootProcessId: "",
-    status: "SCHEDULED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 0,
-    lastUpdate: "2020-08-29T03:35:54.635Z",
-    expirationTime: "2020-08-29T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: null,
-    executionCounter: 1
-  },
-  {
-    id: "dad3aa88-5c1e-4858-a919-781ns75a0fa_0",
-    processId: "travels",
-    processInstanceId: "e4448857-fa0c-403b-ad69-f0a353458b9d",
-    rootProcessId: "",
-    status: "SCHEDULED",
-    priority: 0,
-    callbackEndpoint: "http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0",
-    repeatInterval: null,
-    repeatLimit: null,
-    scheduledId: null,
-    retries: 0,
-    lastUpdate: "2020-08-27T03:35:54.635Z",
-    expirationTime: "2020-08-27T04:35:54.631Z",
-    endpoint: 'http://localhost:4000/jobs',
-    nodeInstanceId: '08c153e8-2766-4675-81f7-29943efdf411',
-    executionCounter: 8
-  }
-],
-UserTaskInstances: [
-  {
-    id: '45a73767-5da3-49bf-9c40-d533c3e77ef3',
-    description: null,
-    name: 'VisaApplication',
-    priority: '1',
-    processInstanceId: '9ae7ce3b-d49c-4f35-b843-8ac3d22fa427',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: 'admin',
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-02-19T11:11:56.282Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"Skippable":"true","trip":{"city":"Boston","country":"US","begin":"2020-02-19T23:00:00.000+01:00","end":"2020-02-26T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","traveller":{"firstName":"Rachel","lastName":"White","email":"rwhite@gorle.com","nationality":"Polish","address":{"street":"Cabalone","city":"Zerf","zipCode":"765756","country":"Poland"}},"Priority":"1"}',
-    outputs: '{}',
-    referenceName: 'Apply for visa (Empty Form)',
-    lastUpdate: '2020-02-19T11:11:56.282Z',
-    endpoint:
-      'http://localhost:4000/travels/9ae7ce3b-d49c-4f35-b843-8ac3d22fa427/VisaApplication/45a73767-5da3-49bf-9c40-d533c3e77ef3'
-  },
-  {
-    id: '047ec38d-5d57-4330-8c8d-9bd67b53a529',
-    description: '',
-    name: 'ConfirmTravel',
-    priority: '1',
-    processInstanceId: '9ae407dd-cdfa-4722-8a49-0a6d2e14550d',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: 'paulo',
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-02-19T10:59:34.185Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null}}',
-    outputs: '{}',
-    referenceName: 'Confirm travel (Submit fails)',
-    lastUpdate: '2020-02-19T13:22:40.909Z',
-    endpoint:
-      'http://localhost:4000/travels/9ae407dd-cdfa-4722-8a49-0a6d2e14550d/VisaApplication/047ec38d-5d57-4330-8c8d-9bd67b53a529'
-  },
-  {
-    id: 'f6be5b6b-34de-4b06-b6e7-05bcf8ba7f54',
-    description: '',
-    name: 'ConfirmTravel',
-    priority: '1',
-    processInstanceId: '4bfdd404-c46a-4751-b401-b1428a30fa07',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Completed',
-    actualOwner: 'paulo',
-    adminGroups: [],
-    adminUsers: [],
-    completed: '2020-02-19T10:49:24.623Z',
-    started: '2020-02-19T10:49:16.559Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null}}',
-    outputs: '{}',
-    referenceName: 'Confirm travel',
-    endpoint:
-      'http://localhost:4000/travels/4bfdd404-c46a-4751-b401-b1428a30fa07/ConfirmTravel/f6be5b6b-34de-4b06-b6e7-05bcf8ba7f54'
-  },
-  {
-    id: '5cead49f-7649-410a-89ff-840cc52adf52',
-    description: '',
-    name: 'ConfirmTravel',
-    priority: '1',
-    processInstanceId: '7e31993d-8c9a-45e8-997d-7156632a520f',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Aborted',
-    actualOwner: 'john',
-    adminGroups: [],
-    adminUsers: [],
-    completed: '2020-02-19T09:55:52.574Z',
-    started: '2020-02-19T09:55:38.81Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null}}',
-    outputs: '{}',
-    referenceName: 'Confirm travel (Details Error)',
-    endpoint:
-      'http://localhost:4000/travels/7e31993d-8c9a-45e8-997d-7156632a520f/ConfirmTravel/5cead49f-7649-410a-89ff-840cc52adf52'
-  },
-  {
-    id: '841b9dba-3d91-4725-9de3-f9f4853b417e',
-    name: 'VisaApplication',
-    referenceName: 'Apply for visa (Submit fail)',
-    description: null,
-    priority: '1',
-    processInstanceId: 'a84df9ba-f41e-47cb-9aa5-67cffff2c5bc',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: 'john',
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:02.386Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:00:02.39Z',
-    endpoint:
-      'http://localhost:4000/travels/a84df9ba-f41e-47cb-9aa5-67cffff2c5bc/VisaApplication/841b9dba-3d91-4725-9de3-f9f4853b417e'
-  },
-  {
-    id: '475e3eb3-1de4-4f68-a146-79c236353a03',
-    name: 'VisaApplication',
-    referenceName: 'Apply for visa (No Form)',
-    description: null,
-    priority: '1',
-    processInstanceId: '5c10ec86-4cf5-4de2-a5ab-d962893f079d',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:04.88Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: ['john', 'poul'],
-    inputs:
-      '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:00:04.884Z',
-    endpoint:
-      'http://localhost:4000/travels/5c10ec86-4cf5-4de2-a5ab-d962893f079d/VisaApplication/475e3eb3-1de4-4f68-a146-79c236353a03'
-  },
-  {
-    id: 'c6fedd33-8fea-4adf-97a0-9d2b6676e9d0',
-    name: 'VisaApplication',
-    referenceName: 'Apply for visa',
-    description: null,
-    priority: '1',
-    processInstanceId: '9d19c8ec-aa5c-4681-9bb5-ff8cbce08091',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:07.075Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:00:07.079Z',
-    endpoint:
-      'http://localhost:4000/travels/9d19c8ec-aa5c-4681-9bb5-ff8cbce08091/VisaApplication/c6fedd33-8fea-4adf-97a0-9d2b6676e9d0'
-  },
-  {
-    id: '809aae9e-f0bf-4892-b0c9-4be80664d2aa',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel (Empty Form)',
-    description: null,
-    priority: '1',
-    processInstanceId: '5204b2d2-54ec-4f07-8f8c-3079a1f5fe9b',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:15.381Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:00:15.389Z',
-    endpoint:
-      'http://localhost:4000/travels/5204b2d2-54ec-4f07-8f8c-3079a1f5fe9b/ConfirmTravel/809aae9e-f0bf-4892-b0c9-4be80664d2aa'
-  },
-  {
-    id: '615b9143-1468-4028-b454-6122e2139f5c',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel (No Form)',
-    description: null,
-    priority: '1',
-    processInstanceId: 'd6685e24-0aad-4e5c-a64f-29e95cae9e5e',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:18.044Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:00:18.05Z',
-    endpoint:
-      'http://localhost:4000/travels/d6685e24-0aad-4e5c-a64f-29e95cae9e5e/ConfirmTravel/615b9143-1468-4028-b454-6122e2139f5c'
-  },
-  {
-    id: '2e37c623-a535-4eb1-ae5b-6eaf7f4039c3',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: '40ab14f0-3a10-4ffd-96e1-05b0028943b4',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:20.832Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:00:20.835Z',
-    endpoint:
-      'http://localhost:4000/travels/40ab14f0-3a10-4ffd-96e1-05b0028943b4/ConfirmTravel/2e37c623-a535-4eb1-ae5b-6eaf7f4039c3'
-  },
-  {
-    id: '3c1d6da4-436a-4728-bc24-9a69781bcbac',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: 'e1d4b174-a9b5-465b-b142-018df18d87d8',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:23.698Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:00:23.701Z',
-    endpoint:
-      'http://localhost:4000/travels/e1d4b174-a9b5-465b-b142-018df18d87d8/ConfirmTravel/3c1d6da4-436a-4728-bc24-9a69781bcbac'
-  },
-  {
-    id: '86ddb2c7-c8e1-435f-a274-a8b0eb066ac1',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: 'b8eebfe7-45f4-4ce7-9019-1740222b302a',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:01:12.65Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:01:12.655Z',
-    endpoint:
-      'http://localhost:4000/travels/b8eebfe7-45f4-4ce7-9019-1740222b302a/ConfirmTravel/86ddb2c7-c8e1-435f-a274-a8b0eb066ac1'
-  },
-  {
-    id: '9e1e0601-f7bd-4ad3-88ca-57afc9e3cf9d',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: '0c469bbf-988b-44e0-8fc9-90286500c519',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:01:14.412Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:01:14.416Z',
-    endpoint:
-      'http://localhost:4000/travels/0c469bbf-988b-44e0-8fc9-90286500c519/ConfirmTravel/9e1e0601-f7bd-4ad3-88ca-57afc9e3cf9d'
-  },
-  {
-    id: 'a3eefa9a-51b0-4820-bc99-94c370389ed5',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: '718f44c2-e574-482c-9a24-60d17e474dde',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:01:16.421Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:01:16.426Z',
-    endpoint:
-      'http://localhost:4000/travels/718f44c2-e574-482c-9a24-60d17e474dde/ConfirmTravel/a3eefa9a-51b0-4820-bc99-94c370389ed5'
-  },
-  {
-    id: 'aa9f477c-5172-4913-956a-6c76f7278207',
-    name: 'VisaApplication',
-    referenceName: 'Apply for visa',
-    description: '',
-    priority: '1',
-    processInstanceId: 'fe523245-05e2-4a0c-abf7-a774cfe9d3f9',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Completed',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: '2020-07-30T09:22:16.417Z',
-    started: '2020-07-30T08:59:55.64Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:22:16.446Z',
-    endpoint:
-      'http://localhost:4000/travels/fe523245-05e2-4a0c-abf7-a774cfe9d3f9/VisaApplication/aa9f477c-5172-4913-956a-6c76f7278207'
-  },
-  {
-    id: '99bb167f-144a-42fb-8f40-b80f34f5bed9',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: '',
-    priority: '1',
-    processInstanceId: '28f63147-b948-4a63-acce-ec2c5c5f15ca',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Aborted',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T08:59:44.749Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:32:14.556Z',
-    endpoint:
-      'http://localhost:4000/travels/28f63147-b948-4a63-acce-ec2c5c5f15ca/ConfirmTravel/99bb167f-144a-42fb-8f40-b80f34f5bed9'
-  },
-  {
-    id: '2f8e0452-b50d-40f8-a657-b32c812828ef',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: '',
-    priority: '1',
-    processInstanceId: '53923218-2a54-40c5-8b01-872d8dd2ec67',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Completed',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: '2020-07-30T09:40:26.896Z',
-    started: '2020-07-30T08:59:47.779Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:40:26.901Z',
-    endpoint:
-      'http://localhost:4000/travels/53923218-2a54-40c5-8b01-872d8dd2ec67/ConfirmTravel/2f8e0452-b50d-40f8-a657-b32c812828ef'
-  },
-  {
-    id: '5ac50f25-192c-4719-9847-f9b8bdfe3381',
-    name: 'VisaApplication',
-    referenceName: 'Apply for visa',
-    description: '',
-    priority: '1',
-    processInstanceId: '8e0eb71c-b5a3-44a3-9b82-d786781a6598',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Completed',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: '2020-07-30T09:43:29.625Z',
-    started: '2020-07-30T08:59:58.565Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:43:29.628Z',
-    endpoint:
-      'http://localhost:4000/travels/8e0eb71c-b5a3-44a3-9b82-d786781a6598/VisaApplication/5ac50f25-192c-4719-9847-f9b8bdfe3381'
-  },
-  {
-    id: 'e878bca4-84f6-46a3-a864-9632ab490cab',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: '',
-    priority: '1',
-    processInstanceId: 'a413fc40-b192-4879-94aa-dc84d0394f67',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Aborted',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T09:00:13.404Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T09:44:00.082Z',
-    endpoint:
-      'http://localhost:4000/travels/a413fc40-b192-4879-94aa-dc84d0394f67/ConfirmTravel/e878bca4-84f6-46a3-a864-9632ab490cab'
-  },
-  {
-    id: '61676d8f-56b7-4bc3-bd40-4c905d4ab176',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: '90a4d7db-c41f-4e01-b6b1-201be823bc07',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T12:57:33.309Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T12:57:33.318Z',
-    endpoint:
-      'http://localhost:4000/travels/90a4d7db-c41f-4e01-b6b1-201be823bc07/ConfirmTravel/61676d8f-56b7-4bc3-bd40-4c905d4ab176'
-  },
-  {
-    id: '0a65028e-c02b-41f9-9260-5b703fb27a27',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: 'fdc72f2c-41fe-440e-bbf6-22510fa4766d',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:05:52.696Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:05:52.699Z',
-    endpoint:
-      'http://localhost:4000/travels/fdc72f2c-41fe-440e-bbf6-22510fa4766d/ConfirmTravel/0a65028e-c02b-41f9-9260-5b703fb27a27'
-  },
-  {
-    id: '5fe852de-8d00-4197-9936-3842c648fee1',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f77bf4',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:08:20.509Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:23:26.824Z',
-    endpoint:
-      'http://localhost:4000/travels/b4096227-2c8a-463f-a7a9-776027f77bf4/ConfirmTravel/5fe852de-8d00-4197-9936-3842c648fee1'
-  },
-  {
-    id: '61676d8f-56b7-4bc3-bd40-4c905d4ab1762',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: '90a4d7db-c41f-4e01-b6b1-201be823bc07',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: 'mary',
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T12:57:33.309Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T12:57:33.318Z',
-    endpoint:
-      'http://localhost:4000/travels/90a4d7db-c41f-4e01-b6b1-201be823bc07/ConfirmTravel/61676d8f-56b7-4bc3-bd40-4c905d4ab1762'
-  },
-  {
-    id: '0a65028e-c02b-41f9-9260-5b703fb27a271',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: 'fdc72f2c-41fe-440e-bbf6-22510fa4766d',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: 'mary',
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:05:52.696Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:05:52.699Z',
-    endpoint:
-      'http://localhost:4000/travels/fdc72f2c-41fe-440e-bbf6-22510fa4766d/ConfirmTravel/0a65028e-c02b-41f9-9260-5b703fb27a271'
-  },
-  {
-    id: '5fe852de-8d00-4197-9936-3842c648fee134',
-    name: 'ConfirmTravel',
-    referenceName: 'Confirm travel',
-    description: null,
-    priority: '1',
-    processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f77bf4',
-    processId: 'travels',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: 'mary',
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:08:20.509Z',
-    excludedUsers: [],
-    potentialGroups: [],
-    potentialUsers: [],
-    inputs:
-      '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:23:26.824Z',
-    endpoint:
-      'http://localhost:4000/travels/b4096227-2c8a-463f-a7a9-776027f77bf4/ConfirmTravel/5fe852de-8d00-4197-9936-3842c648fee134'
-  },
-  {
-    id: '5fe852de-8d00-4197-9936-3842c648fe1234',
-    name: 'HRInterview',
-    referenceName: 'Human Resources Interview (HTML)',
-    description: null,
-    priority: '1',
-    processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f71234',
-    processId: 'html_hiring',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:08:20.509Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:23:26.824Z',
-    endpoint:
-      'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f71234/HRInterview/5fe852de-8d00-4197-9936-3842c648fe1234'
-  },
-  {
-    id: '5fe852de-8d00-4197-9936-3842c648fe12345',
-    name: 'HRInterview',
-    referenceName: 'Human Resources Interview (HTML - submit failure)',
-    description: null,
-    priority: '1',
-    processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f712345',
-    processId: 'html_hiring',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:08:20.509Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:23:26.824Z',
-    endpoint:
-      'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f712345/HRInterview/5fe852de-8d00-4197-9936-3842c648fe12345'
-  },
-  {
-    id: '5fe852de-8d00-4197-9936-3842c648fe12342',
-    name: 'HRInterview',
-    referenceName: 'Human Resources Interview (React)',
-    description: null,
-    priority: '1',
-    processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f712342',
-    processId: 'react_hiring',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:08:20.509Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:23:26.824Z',
-    endpoint:
-      'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f712342/HRInterview/5fe852de-8d00-4197-9936-3842c648fe12342'
-  },
-  {
-    id: '5fe852de-8d00-4197-9936-3842c648fe123422',
-    name: 'HRInterview',
-    referenceName: 'Human Resources Interview (React - submit failure)',
-    description: null,
-    priority: '1',
-    processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f7123422',
-    processId: 'react_hiring',
-    rootProcessInstanceId: null,
-    rootProcessId: null,
-    state: 'Ready',
-    actualOwner: null,
-    adminGroups: [],
-    adminUsers: [],
-    completed: null,
-    started: '2020-07-30T13:08:20.509Z',
-    excludedUsers: [],
-    potentialGroups: ['employees', 'interns', 'managers'],
-    potentialUsers: [],
-    inputs:
-      '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
-    outputs: '{}',
-    lastUpdate: '2020-07-30T13:23:26.824Z',
-    endpoint:
-      'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f7123422/HRInterview/5fe852de-8d00-4197-9936-3842c648fe123422'
-  }
-]
-}
\ No newline at end of file
+    {
+      id: '2234dde-npce1-2908-b3131-i15333c675a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'CANCELED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 0,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: '7f7d74c1-78f7-49be-b5ad-8d132f46a49c',
+      executionCounter: 3
+    },
+    {
+      id: 'T3113e-vbg43-2234-lo89-u8103214ra0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'ERROR',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: 30300,
+      repeatLimit: 3,
+      scheduledId: null,
+      retries: 0,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: 'af0d984c-4abd-4f5c-83a8-426e6b3d102a',
+      executionCounter: 2
+    },
+    {
+      id: 'bff4ee-11qw23-6675-po987-qwedfrt45a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'RETRY',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 0,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: 'b2761011-3043-4f48-82bd-1395bf651a91',
+      executionCounter: 9
+    },
+    {
+      id: 'eff4ee-11qw23-6675-pokau97-ql10s5ut45a0fa_0',
+      processId: 'travels',
+      processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+      rootProcessId: '',
+      status: 'SCHEDULED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 0,
+      lastUpdate: '2020-08-29T03:35:54.635Z',
+      expirationTime: '2020-08-29T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: null,
+      executionCounter: 1
+    },
+    {
+      id: 'dad3aa88-5c1e-4858-a919-781ns75a0fa_0',
+      processId: 'travels',
+      processInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+      rootProcessId: '',
+      status: 'SCHEDULED',
+      priority: 0,
+      callbackEndpoint:
+        'http://localhost:8080/management/jobs/travels/instances/5c56eeff-4cbf-3313-a325-4c895e0afced/timers/dad3aa88-5c1e-4858-a919-6123c675a0fa_0',
+      repeatInterval: null,
+      repeatLimit: null,
+      scheduledId: null,
+      retries: 0,
+      lastUpdate: '2020-08-27T03:35:54.635Z',
+      expirationTime: '2020-08-27T04:35:54.631Z',
+      endpoint: 'http://localhost:4000/jobs',
+      nodeInstanceId: '08c153e8-2766-4675-81f7-29943efdf411',
+      executionCounter: 8
+    }
+  ],
+  UserTaskInstances: [
+    {
+      id: '45a73767-5da3-49bf-9c40-d533c3e77ef3',
+      description: null,
+      name: 'VisaApplication',
+      priority: '1',
+      processInstanceId: '9ae7ce3b-d49c-4f35-b843-8ac3d22fa427',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: 'admin',
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-02-19T11:11:56.282Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"Skippable":"true","trip":{"city":"Boston","country":"US","begin":"2020-02-19T23:00:00.000+01:00","end":"2020-02-26T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","traveller":{"firstName":"Rachel","lastName":"White","email":"rwhite@gorle.com","nationality":"Polish","address":{"street":"Cabalone","city":"Zerf","zipCode":"765756","country":"Poland"}},"Priority":"1"}',
+      outputs: '{}',
+      referenceName: 'Apply for visa (Empty Form)',
+      lastUpdate: '2020-02-19T11:11:56.282Z',
+      endpoint:
+        'http://localhost:4000/travels/9ae7ce3b-d49c-4f35-b843-8ac3d22fa427/VisaApplication/45a73767-5da3-49bf-9c40-d533c3e77ef3'
+    },
+    {
+      id: '047ec38d-5d57-4330-8c8d-9bd67b53a529',
+      description: '',
+      name: 'ConfirmTravel',
+      priority: '1',
+      processInstanceId: '9ae407dd-cdfa-4722-8a49-0a6d2e14550d',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: 'paulo',
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-02-19T10:59:34.185Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null}}',
+      outputs: '{}',
+      referenceName: 'Confirm travel (Submit fails)',
+      lastUpdate: '2020-02-19T13:22:40.909Z',
+      endpoint:
+        'http://localhost:4000/travels/9ae407dd-cdfa-4722-8a49-0a6d2e14550d/VisaApplication/047ec38d-5d57-4330-8c8d-9bd67b53a529'
+    },
+    {
+      id: 'f6be5b6b-34de-4b06-b6e7-05bcf8ba7f54',
+      description: '',
+      name: 'ConfirmTravel',
+      priority: '1',
+      processInstanceId: '4bfdd404-c46a-4751-b401-b1428a30fa07',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Completed',
+      actualOwner: 'paulo',
+      adminGroups: [],
+      adminUsers: [],
+      completed: '2020-02-19T10:49:24.623Z',
+      started: '2020-02-19T10:49:16.559Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null}}',
+      outputs: '{}',
+      referenceName: 'Confirm travel',
+      endpoint:
+        'http://localhost:4000/travels/4bfdd404-c46a-4751-b401-b1428a30fa07/ConfirmTravel/f6be5b6b-34de-4b06-b6e7-05bcf8ba7f54'
+    },
+    {
+      id: '5cead49f-7649-410a-89ff-840cc52adf52',
+      description: '',
+      name: 'ConfirmTravel',
+      priority: '1',
+      processInstanceId: '7e31993d-8c9a-45e8-997d-7156632a520f',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Aborted',
+      actualOwner: 'john',
+      adminGroups: [],
+      adminUsers: [],
+      completed: '2020-02-19T09:55:52.574Z',
+      started: '2020-02-19T09:55:38.81Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null}}',
+      outputs: '{}',
+      referenceName: 'Confirm travel (Details Error)',
+      endpoint:
+        'http://localhost:4000/travels/7e31993d-8c9a-45e8-997d-7156632a520f/ConfirmTravel/5cead49f-7649-410a-89ff-840cc52adf52'
+    },
+    {
+      id: '841b9dba-3d91-4725-9de3-f9f4853b417e',
+      name: 'VisaApplication',
+      referenceName: 'Apply for visa (Submit fail)',
+      description: null,
+      priority: '1',
+      processInstanceId: 'a84df9ba-f41e-47cb-9aa5-67cffff2c5bc',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: 'john',
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:02.386Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:00:02.39Z',
+      endpoint:
+        'http://localhost:4000/travels/a84df9ba-f41e-47cb-9aa5-67cffff2c5bc/VisaApplication/841b9dba-3d91-4725-9de3-f9f4853b417e'
+    },
+    {
+      id: '475e3eb3-1de4-4f68-a146-79c236353a03',
+      name: 'VisaApplication',
+      referenceName: 'Apply for visa (No Form)',
+      description: null,
+      priority: '1',
+      processInstanceId: '5c10ec86-4cf5-4de2-a5ab-d962893f079d',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:04.88Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: ['john', 'poul'],
+      inputs:
+        '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:00:04.884Z',
+      endpoint:
+        'http://localhost:4000/travels/5c10ec86-4cf5-4de2-a5ab-d962893f079d/VisaApplication/475e3eb3-1de4-4f68-a146-79c236353a03'
+    },
+    {
+      id: 'c6fedd33-8fea-4adf-97a0-9d2b6676e9d0',
+      name: 'VisaApplication',
+      referenceName: 'Apply for visa',
+      description: null,
+      priority: '1',
+      processInstanceId: '9d19c8ec-aa5c-4681-9bb5-ff8cbce08091',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:07.075Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:00:07.079Z',
+      endpoint:
+        'http://localhost:4000/travels/9d19c8ec-aa5c-4681-9bb5-ff8cbce08091/VisaApplication/c6fedd33-8fea-4adf-97a0-9d2b6676e9d0'
+    },
+    {
+      id: '809aae9e-f0bf-4892-b0c9-4be80664d2aa',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel (Empty Form)',
+      description: null,
+      priority: '1',
+      processInstanceId: '5204b2d2-54ec-4f07-8f8c-3079a1f5fe9b',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:15.381Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:00:15.389Z',
+      endpoint:
+        'http://localhost:4000/travels/5204b2d2-54ec-4f07-8f8c-3079a1f5fe9b/ConfirmTravel/809aae9e-f0bf-4892-b0c9-4be80664d2aa'
+    },
+    {
+      id: '615b9143-1468-4028-b454-6122e2139f5c',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel (No Form)',
+      description: null,
+      priority: '1',
+      processInstanceId: 'd6685e24-0aad-4e5c-a64f-29e95cae9e5e',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:18.044Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:00:18.05Z',
+      endpoint:
+        'http://localhost:4000/travels/d6685e24-0aad-4e5c-a64f-29e95cae9e5e/ConfirmTravel/615b9143-1468-4028-b454-6122e2139f5c'
+    },
+    {
+      id: '2e37c623-a535-4eb1-ae5b-6eaf7f4039c3',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: '40ab14f0-3a10-4ffd-96e1-05b0028943b4',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:20.832Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:00:20.835Z',
+      endpoint:
+        'http://localhost:4000/travels/40ab14f0-3a10-4ffd-96e1-05b0028943b4/ConfirmTravel/2e37c623-a535-4eb1-ae5b-6eaf7f4039c3'
+    },
+    {
+      id: '3c1d6da4-436a-4728-bc24-9a69781bcbac',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: 'e1d4b174-a9b5-465b-b142-018df18d87d8',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:23.698Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:00:23.701Z',
+      endpoint:
+        'http://localhost:4000/travels/e1d4b174-a9b5-465b-b142-018df18d87d8/ConfirmTravel/3c1d6da4-436a-4728-bc24-9a69781bcbac'
+    },
+    {
+      id: '86ddb2c7-c8e1-435f-a274-a8b0eb066ac1',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: 'b8eebfe7-45f4-4ce7-9019-1740222b302a',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:01:12.65Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:01:12.655Z',
+      endpoint:
+        'http://localhost:4000/travels/b8eebfe7-45f4-4ce7-9019-1740222b302a/ConfirmTravel/86ddb2c7-c8e1-435f-a274-a8b0eb066ac1'
+    },
+    {
+      id: '9e1e0601-f7bd-4ad3-88ca-57afc9e3cf9d',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: '0c469bbf-988b-44e0-8fc9-90286500c519',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:01:14.412Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:01:14.416Z',
+      endpoint:
+        'http://localhost:4000/travels/0c469bbf-988b-44e0-8fc9-90286500c519/ConfirmTravel/9e1e0601-f7bd-4ad3-88ca-57afc9e3cf9d'
+    },
+    {
+      id: 'a3eefa9a-51b0-4820-bc99-94c370389ed5',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: '718f44c2-e574-482c-9a24-60d17e474dde',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:01:16.421Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:01:16.426Z',
+      endpoint:
+        'http://localhost:4000/travels/718f44c2-e574-482c-9a24-60d17e474dde/ConfirmTravel/a3eefa9a-51b0-4820-bc99-94c370389ed5'
+    },
+    {
+      id: 'aa9f477c-5172-4913-956a-6c76f7278207',
+      name: 'VisaApplication',
+      referenceName: 'Apply for visa',
+      description: '',
+      priority: '1',
+      processInstanceId: 'fe523245-05e2-4a0c-abf7-a774cfe9d3f9',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Completed',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: '2020-07-30T09:22:16.417Z',
+      started: '2020-07-30T08:59:55.64Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:22:16.446Z',
+      endpoint:
+        'http://localhost:4000/travels/fe523245-05e2-4a0c-abf7-a774cfe9d3f9/VisaApplication/aa9f477c-5172-4913-956a-6c76f7278207'
+    },
+    {
+      id: '99bb167f-144a-42fb-8f40-b80f34f5bed9',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: '',
+      priority: '1',
+      processInstanceId: '28f63147-b948-4a63-acce-ec2c5c5f15ca',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Aborted',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T08:59:44.749Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:32:14.556Z',
+      endpoint:
+        'http://localhost:4000/travels/28f63147-b948-4a63-acce-ec2c5c5f15ca/ConfirmTravel/99bb167f-144a-42fb-8f40-b80f34f5bed9'
+    },
+    {
+      id: '2f8e0452-b50d-40f8-a657-b32c812828ef',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: '',
+      priority: '1',
+      processInstanceId: '53923218-2a54-40c5-8b01-872d8dd2ec67',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Completed',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: '2020-07-30T09:40:26.896Z',
+      started: '2020-07-30T08:59:47.779Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:40:26.901Z',
+      endpoint:
+        'http://localhost:4000/travels/53923218-2a54-40c5-8b01-872d8dd2ec67/ConfirmTravel/2f8e0452-b50d-40f8-a657-b32c812828ef'
+    },
+    {
+      id: '5ac50f25-192c-4719-9847-f9b8bdfe3381',
+      name: 'VisaApplication',
+      referenceName: 'Apply for visa',
+      description: '',
+      priority: '1',
+      processInstanceId: '8e0eb71c-b5a3-44a3-9b82-d786781a6598',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Completed',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: '2020-07-30T09:43:29.625Z',
+      started: '2020-07-30T08:59:58.565Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"trip":{"city":"New York","country":"US","begin":"2019-12-09T23:00:00.000+01:00","end":"2019-12-14T23:00:00.000+01:00","visaRequired":true},"TaskName":"VisaApplication","NodeName":"Apply for visa","Priority":"1","Skippable":"true","traveller":{"firstName":"Jan","lastName":"Kowalski","email":"jan.kowalski@example.com","nationality":"Polish","address":{"street":"polna","city":"Krakow","zipCode":"32000","country":"Poland"}},"GroupId":"group1"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:43:29.628Z',
+      endpoint:
+        'http://localhost:4000/travels/8e0eb71c-b5a3-44a3-9b82-d786781a6598/VisaApplication/5ac50f25-192c-4719-9847-f9b8bdfe3381'
+    },
+    {
+      id: 'e878bca4-84f6-46a3-a864-9632ab490cab',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: '',
+      priority: '1',
+      processInstanceId: 'a413fc40-b192-4879-94aa-dc84d0394f67',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Aborted',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T09:00:13.404Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T09:44:00.082Z',
+      endpoint:
+        'http://localhost:4000/travels/a413fc40-b192-4879-94aa-dc84d0394f67/ConfirmTravel/e878bca4-84f6-46a3-a864-9632ab490cab'
+    },
+    {
+      id: '61676d8f-56b7-4bc3-bd40-4c905d4ab176',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: '90a4d7db-c41f-4e01-b6b1-201be823bc07',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T12:57:33.309Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T12:57:33.318Z',
+      endpoint:
+        'http://localhost:4000/travels/90a4d7db-c41f-4e01-b6b1-201be823bc07/ConfirmTravel/61676d8f-56b7-4bc3-bd40-4c905d4ab176'
+    },
+    {
+      id: '0a65028e-c02b-41f9-9260-5b703fb27a27',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: 'fdc72f2c-41fe-440e-bbf6-22510fa4766d',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:05:52.696Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:05:52.699Z',
+      endpoint:
+        'http://localhost:4000/travels/fdc72f2c-41fe-440e-bbf6-22510fa4766d/ConfirmTravel/0a65028e-c02b-41f9-9260-5b703fb27a27'
+    },
+    {
+      id: '5fe852de-8d00-4197-9936-3842c648fee1',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f77bf4',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:08:20.509Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:23:26.824Z',
+      endpoint:
+        'http://localhost:4000/travels/b4096227-2c8a-463f-a7a9-776027f77bf4/ConfirmTravel/5fe852de-8d00-4197-9936-3842c648fee1'
+    },
+    {
+      id: '61676d8f-56b7-4bc3-bd40-4c905d4ab1762',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: '90a4d7db-c41f-4e01-b6b1-201be823bc07',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: 'mary',
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T12:57:33.309Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T12:57:33.318Z',
+      endpoint:
+        'http://localhost:4000/travels/90a4d7db-c41f-4e01-b6b1-201be823bc07/ConfirmTravel/61676d8f-56b7-4bc3-bd40-4c905d4ab1762'
+    },
+    {
+      id: '0a65028e-c02b-41f9-9260-5b703fb27a271',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: 'fdc72f2c-41fe-440e-bbf6-22510fa4766d',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: 'mary',
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:05:52.696Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:05:52.699Z',
+      endpoint:
+        'http://localhost:4000/travels/fdc72f2c-41fe-440e-bbf6-22510fa4766d/ConfirmTravel/0a65028e-c02b-41f9-9260-5b703fb27a271'
+    },
+    {
+      id: '5fe852de-8d00-4197-9936-3842c648fee134',
+      name: 'ConfirmTravel',
+      referenceName: 'Confirm travel',
+      description: null,
+      priority: '1',
+      processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f77bf4',
+      processId: 'travels',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: 'mary',
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:08:20.509Z',
+      excludedUsers: [],
+      potentialGroups: [],
+      potentialUsers: [],
+      inputs:
+        '{"flight":{"flightNumber":"MX555","seat":null,"gate":null,"departure":"2019-12-09T23:00:00.000+01:00","arrival":"2019-12-14T23:00:00.000+01:00"},"TaskName":"ConfirmTravel","NodeName":"Confirm travel","Priority":"1","Skippable":"true","hotel":{"name":"Perfect hotel","address":{"street":"street","city":"New York","zipCode":"12345","country":"US"},"phone":"09876543","bookingNumber":"XX-012345","room":null},"GroupId":"group2"}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:23:26.824Z',
+      endpoint:
+        'http://localhost:4000/travels/b4096227-2c8a-463f-a7a9-776027f77bf4/ConfirmTravel/5fe852de-8d00-4197-9936-3842c648fee134'
+    },
+    {
+      id: '5fe852de-8d00-4197-9936-3842c648fe1234',
+      name: 'HRInterview',
+      referenceName: 'Human Resources Interview (HTML)',
+      description: null,
+      priority: '1',
+      processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f71234',
+      processId: 'html_hiring',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:08:20.509Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:23:26.824Z',
+      endpoint:
+        'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f71234/HRInterview/5fe852de-8d00-4197-9936-3842c648fe1234'
+    },
+    {
+      id: '5fe852de-8d00-4197-9936-3842c648fe12345',
+      name: 'HRInterview',
+      referenceName: 'Human Resources Interview (HTML - submit failure)',
+      description: null,
+      priority: '1',
+      processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f712345',
+      processId: 'html_hiring',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:08:20.509Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:23:26.824Z',
+      endpoint:
+        'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f712345/HRInterview/5fe852de-8d00-4197-9936-3842c648fe12345'
+    },
+    {
+      id: '5fe852de-8d00-4197-9936-3842c648fe12342',
+      name: 'HRInterview',
+      referenceName: 'Human Resources Interview (React)',
+      description: null,
+      priority: '1',
+      processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f712342',
+      processId: 'react_hiring',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:08:20.509Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:23:26.824Z',
+      endpoint:
+        'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f712342/HRInterview/5fe852de-8d00-4197-9936-3842c648fe12342'
+    },
+    {
+      id: '5fe852de-8d00-4197-9936-3842c648fe123422',
+      name: 'HRInterview',
+      referenceName: 'Human Resources Interview (React - submit failure)',
+      description: null,
+      priority: '1',
+      processInstanceId: 'b4096227-2c8a-463f-a7a9-776027f7123422',
+      processId: 'react_hiring',
+      rootProcessInstanceId: null,
+      rootProcessId: null,
+      state: 'Ready',
+      actualOwner: null,
+      adminGroups: [],
+      adminUsers: [],
+      completed: null,
+      started: '2020-07-30T13:08:20.509Z',
+      excludedUsers: [],
+      potentialGroups: ['employees', 'interns', 'managers'],
+      potentialUsers: [],
+      inputs:
+        '{"candidate": {"name": "Harry Potter", "email": "harrypotter@example.com", "salary": 30000,"skills": "Java, Kogito", "birthday": "2019-12-10T00:00:00.000+02:00"}}',
+      outputs: '{}',
+      lastUpdate: '2020-07-30T13:23:26.824Z',
+      endpoint:
+        'http://localhost:4000/hiring/b4096227-2c8a-463f-a7a9-776027f7123422/HRInterview/5fe852de-8d00-4197-9936-3842c648fe123422'
+    }
+  ]
+};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/mutationRest.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/mutationRest.js
index c593eec703..f9db8b9132 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/mutationRest.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/mutationRest.js
@@ -1,84 +1,102 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = restData = {
-    management: {
-        process: [
-            {
-                processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
-                skip: 'Internal server error',
-                retrigger: 'success',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf864',
-                skip: 'success',
-                retrigger: 'success',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf865',
-                skip: 'failed',
-                retrigger: 'failed',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
-                skip: 'success',
-                retrigger: 'Authentication failed',
-                aborted: 'Authorization failed'
-            },
-            {
-                processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf867',
-                skip: 'failed',
-                retrigger: 'failed',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf868',
-                skip: 'success',
-                retrigger: 'success',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
-                skip: 'success',
-                retrigger: 'Authentication failed',
-                aborted: 'success'
-            },
-            {
-                processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0bccddee',
-                skip: 'failed',
-                retrigger: 'success',
-                aborted: 'success'
-            },
-            {
-                processInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
-                skip: 'success',
-                retrigger: 'Authentication failed',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: 'tEE12-fo54-l665-mp112-akou112345566',
-                skip: 'Authentication failed',
-                retrigger: 'success',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: 'RZ11-tu77-hj321-bnfhe1-xdr2134',
-                skip: 'success',
-                retrigger: 'Authentication failed',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b1',
-                skip: 'success',
-                retrigger: 'Authentication failed',
-                aborted: 'Internal server error'
-            },
-            {
-                processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
-                skip: 'success',
-                retrigger: 'Authentication failed',
-                aborted: 'Internal server error'
-            }
-        ]
-    }
+  management: {
+    process: [
+      {
+        processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf863',
+        skip: 'Internal server error',
+        retrigger: 'success',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf864',
+        skip: 'success',
+        retrigger: 'success',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf865',
+        skip: 'failed',
+        retrigger: 'failed',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: 'e4448857-fa0c-403b-ad69-f0a353458b9d',
+        skip: 'success',
+        retrigger: 'Authentication failed',
+        aborted: 'Authorization failed'
+      },
+      {
+        processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf867',
+        skip: 'failed',
+        retrigger: 'failed',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: 'a23e6c20-02c2-4c2b-8c5c-e988a0adf868',
+        skip: 'success',
+        retrigger: 'success',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+        skip: 'success',
+        retrigger: 'Authentication failed',
+        aborted: 'success'
+      },
+      {
+        processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0bccddee',
+        skip: 'failed',
+        retrigger: 'success',
+        aborted: 'success'
+      },
+      {
+        processInstanceId: '538f9feb-5a14-4096-b791-2055b38da7c6',
+        skip: 'success',
+        retrigger: 'Authentication failed',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: 'tEE12-fo54-l665-mp112-akou112345566',
+        skip: 'Authentication failed',
+        retrigger: 'success',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: 'RZ11-tu77-hj321-bnfhe1-xdr2134',
+        skip: 'success',
+        retrigger: 'Authentication failed',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b1',
+        skip: 'success',
+        retrigger: 'Authentication failed',
+        aborted: 'Internal server error'
+      },
+      {
+        processInstanceId: '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
+        skip: 'success',
+        retrigger: 'Authentication failed',
+        aborted: 'Internal server error'
+      }
+    ]
+  }
 };
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ApplyForVisa.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ApplyForVisa.js
index 44cdb56218..104b9114c9 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ApplyForVisa.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ApplyForVisa.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = ApplyForVisaForm = {
   type: 'object',
   properties: {
@@ -84,5 +86,5 @@ module.exports = ApplyForVisaForm = {
         nationality: { type: 'string' }
       }
     }
-  },
+  }
 };
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ConfirmTravel.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ConfirmTravel.js
index e1e17a0ac1..f147e7a523 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ConfirmTravel.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/ConfirmTravel.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = ConfirmTravelForm = {
   type: 'object',
   properties: {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/hiring.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/hiring.js
index 9ef5a3a8df..766a407fae 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/hiring.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/process-forms-schema/hiring.js
@@ -1,29 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {
-    type: 'object',
-    properties: {
-        Candidate: {
-            type: "object",
-            properties: {
-                email: {
-                    type: "string"
-                },
-                name: {
-                    type: "string"
-                },
-                salary: {
-                    type: "integer"
-                },
-                skills: {
-                    type: "string"
-                }
-            }
+  type: 'object',
+  properties: {
+    Candidate: {
+      type: 'object',
+      properties: {
+        email: {
+          type: 'string'
         },
-            hr_approval: {
-                type: "boolean"
-            },
-            it_approval: {
-                type: "boolean"
-            }
+        name: {
+          type: 'string'
+        },
+        salary: {
+          type: 'integer'
+        },
+        skills: {
+          type: 'string'
         }
-
+      }
+    },
+    hr_approval: {
+      type: 'boolean'
+    },
+    it_approval: {
+      type: 'boolean'
     }
+  }
+};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/rest.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/rest.js
index be9a5c32cf..4879f662f1 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/rest.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/rest.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = restData = {
   management: {
     process: [
@@ -74,7 +92,7 @@ module.exports = restData = {
             skip: 'success',
             retrigger: 'Authentication failed',
             aborted: 'Internal server error'
-          },
+          }
         ]
       }
     ]
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/types.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/types.js
index 7862560ae9..615a7ce7f4 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/types.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/MockData/types.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { gql } = require('apollo-server-express');
 module.exports = typeDefs = gql`
   scalar DateTime
@@ -6,19 +24,19 @@ module.exports = typeDefs = gql`
     query: Query
     mutation: Mutation
   }
-  
+
   type Mutation {
     ProcessInstanceSkip(id: String): String
     ProcessInstanceAbort(id: String): String
     ProcessInstanceRetry(id: String): String
-    ProcessInstanceUpdateVariables(id: String variables: String): String
-    NodeInstanceTrigger(id: String nodeId: String): String
-    NodeInstanceCancel(id: String nodeInstanceId: String): String
-    NodeInstanceRetrigger(id: String nodeInstanceId: String): String
+    ProcessInstanceUpdateVariables(id: String, variables: String): String
+    NodeInstanceTrigger(id: String, nodeId: String): String
+    NodeInstanceCancel(id: String, nodeInstanceId: String): String
+    NodeInstanceRetrigger(id: String, nodeInstanceId: String): String
     JobCancel(id: String): String
-    JobReschedule(id: String data: String): String
+    JobReschedule(id: String, data: String): String
   }
-  
+
   type Query {
     ProcessInstances(
       where: ProcessInstanceArgument
@@ -40,11 +58,7 @@ module.exports = typeDefs = gql`
       orderBy: VisaApplicationsOrderBy
       pagination: Pagination
     ): [VisaApplications]
-    Jobs(
-      where: JobArgument
-      orderBy: JobOrderBy
-      pagination: Pagination
-      ): [Job]
+    Jobs(where: JobArgument, orderBy: JobOrderBy, pagination: Pagination): [Job]
   }
 
   type ProcessInstance {
@@ -138,7 +152,7 @@ module.exports = typeDefs = gql`
     type: String!
     uniqueId: String!
   }
-  
+
   type Milestones {
     id: String!
     name: String!
@@ -149,7 +163,7 @@ module.exports = typeDefs = gql`
     AVAILABLE
     COMPLETED
   }
-  
+
   input ProcessInstanceOrderBy {
     processId: OrderBy
     processName: OrderBy
@@ -605,9 +619,9 @@ module.exports = typeDefs = gql`
     lastUpdate: DateArgument
     endpoint: StringArgument
     nodeInstanceId: StringArgument
-}
+  }
 
-input JobOrderBy {
+  input JobOrderBy {
     processId: OrderBy
     rootProcessId: OrderBy
     status: OrderBy
@@ -616,38 +630,38 @@ input JobOrderBy {
     retries: OrderBy
     lastUpdate: OrderBy
     executionCounter: OrderBy
-}
-
-input JobStatusArgument {
-  equal: JobStatus
-  in: [JobStatus]
-}
-
-type Job {
-  id: String!
-  processId: String
-  processInstanceId: String
-  rootProcessInstanceId: String
-  rootProcessId: String
-  status: JobStatus!
-  expirationTime: DateTime
-  priority: Int
-  callbackEndpoint: String
-  repeatInterval: Int
-  repeatLimit: Int
-  scheduledId: String
-  retries: Int
-  lastUpdate: DateTime
-  executionCounter: Int
-  endpoint: String
-  nodeInstanceId: String
-}
-
-enum JobStatus {
-  ERROR
-  EXECUTED
-  SCHEDULED
-  RETRY
-  CANCELED
-}
+  }
+
+  input JobStatusArgument {
+    equal: JobStatus
+    in: [JobStatus]
+  }
+
+  type Job {
+    id: String!
+    processId: String
+    processInstanceId: String
+    rootProcessInstanceId: String
+    rootProcessId: String
+    status: JobStatus!
+    expirationTime: DateTime
+    priority: Int
+    callbackEndpoint: String
+    repeatInterval: Int
+    repeatLimit: Int
+    scheduledId: String
+    retries: Int
+    lastUpdate: DateTime
+    executionCounter: Int
+    endpoint: String
+    nodeInstanceId: String
+  }
+
+  enum JobStatus {
+    ERROR
+    EXECUTED
+    SCHEDULED
+    RETRY
+    CANCELED
+  }
 `;
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/app.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/app.js
index 11030be829..a87ce7a13c 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/app.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/app.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const server = require('./server');
 
 server.listen();
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/config/index.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/config/index.js
index 269f1d2d06..5fd12d5369 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/config/index.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/config/index.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const commonConfig = {
   env: process.env.NODE_ENV || 'development',
   port: parseInt(process.env.PORT, 10) || 4000,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/server.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/server.js
index 2ecda0e190..83dc434b04 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/server/server.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/server/server.js
@@ -1,11 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 // HTTP SERVER
 const express = require('express');
 const swaggerUi = require('swagger-ui-express');
-const swaggerApiDoc = require('./MockData/openAPI/openapi.json')
+const swaggerApiDoc = require('./MockData/openAPI/openapi.json');
 var cors = require('cors');
 const app = express();
 const { ApolloServer, gql } = require('apollo-server-express');
-var bodyParser = require('body-parser')
+var bodyParser = require('body-parser');
 // GraphQL - Apollo
 const { GraphQLScalarType } = require('graphql');
 const uuidv1 = require('uuid/v1');
@@ -17,13 +35,13 @@ const config = require('./config');
 const data = require('./MockData/graphql');
 const controller = require('./MockData/controllers');
 const typeDefs = require('./MockData/types');
-const mutationRestData = require("./MockData/mutationRest");
+const mutationRestData = require('./MockData/mutationRest');
 
 const swaggerOptions = {
   swaggerOptions: {
-      url: "/q/openapi.json",
-  },
-}
+    url: '/q/openapi.json'
+  }
+};
 
 function setPort(port = 4000) {
   app.set('port', parseInt(port, 10));
@@ -38,18 +56,22 @@ function listen() {
   });
 }
 // parse application/x-www-form-urlencoded
-app.use(bodyParser.urlencoded({ extended: false }))
+app.use(bodyParser.urlencoded({ extended: false }));
 
 // parse application/json
-app.use(bodyParser.json())
+app.use(bodyParser.json());
 app.use(
   cors({
     origin: config.corsDomain, // Be sure to switch to your production domain
     optionsSuccessStatus: 200
   })
 );
-app.get("/q/openapi.json", (req, res) => res.json(swaggerApiDoc));
-app.use('/docs', swaggerUi.serveFiles(null,swaggerOptions), swaggerUi.setup(null,swaggerOptions));
+app.get('/q/openapi.json', (req, res) => res.json(swaggerApiDoc));
+app.use(
+  '/docs',
+  swaggerUi.serveFiles(null, swaggerOptions),
+  swaggerUi.setup(null, swaggerOptions)
+);
 
 //Rest Api's
 // http://localhost:4000/management/processes/{processId}/instances/{processInstanceId}/error
@@ -73,17 +95,23 @@ app.delete(
   '/management/processes/:processId/instances/:processInstanceId',
   controller.callAbort
 );
-app.post('/management/processes/:processId/instances/:processInstanceId/nodeInstances/:nodeInstanceId',
+app.post(
+  '/management/processes/:processId/instances/:processInstanceId/nodeInstances/:nodeInstanceId',
   controller.callNodeRetrigger
 );
-app.delete('/management/processes/:processId/instances/:processInstanceId/nodeInstances/:nodeInstanceId',
+app.delete(
+  '/management/processes/:processId/instances/:processInstanceId/nodeInstances/:nodeInstanceId',
   controller.callNodeCancel
 );
 app.patch('/jobs/:id', controller.handleJobReschedule);
-app.post('/management/processes/:processId/instances/:processInstanceId/nodes/:nodeId',
+app.post(
+  '/management/processes/:processId/instances/:processInstanceId/nodes/:nodeId',
   controller.callNodeTrigger
 );
-app.get('/management/processes/:processId/nodes', controller.getTriggerableNodes)
+app.get(
+  '/management/processes/:processId/nodes',
+  controller.getTriggerableNodes
+);
 app.delete('/jobs/:jobId', controller.callJobCancel);
 app.get('/svg/processes/:processId/instances/:id', controller.dispatchSVG);
 
@@ -157,7 +185,7 @@ const checkTaskAssignment = (userTaskInstance, assignments) => {
     }
     const potentialGroupsClause = assignments.or[1].and[2].or[1];
     if (
-      potentialGroupsClause.potentialGroups.containsAny.some(clauseGroup =>
+      potentialGroupsClause.potentialGroups.containsAny.some((clauseGroup) =>
         userTaskInstance.potentialGroups.includes(clauseGroup)
       )
     ) {
@@ -167,7 +195,7 @@ const checkTaskAssignment = (userTaskInstance, assignments) => {
 };
 
 function timeout(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
+  return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
 function paginatedResult(arr, offset, limit) {
@@ -182,52 +210,63 @@ function paginatedResult(arr, offset, limit) {
 }
 
 function setProcessInstanceState(processInstanceId, state) {
-  const processInstance = data.ProcessInstanceData.filter(data => data.id === processInstanceId);
+  const processInstance = data.ProcessInstanceData.filter(
+    (data) => data.id === processInstanceId
+  );
   processInstance[0].state = state;
 }
 
-const processSvg = ['8035b580-6ae4-4aa8-9ec0-e18e19809e0b','a1e139d5-4e77-48c9-84ae-34578e904e5a','8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop', '2d962eef-45b8-48a9-ad4e-9cde0ad6af88', 'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e']
-const fs = require('fs')
+const processSvg = [
+  '8035b580-6ae4-4aa8-9ec0-e18e19809e0b',
+  'a1e139d5-4e77-48c9-84ae-34578e904e5a',
+  '8035b580-6ae4-4aa8-9ec0-e18e19809e0blmnop',
+  '2d962eef-45b8-48a9-ad4e-9cde0ad6af88',
+  'c54ca5b0-b975-46e2-a9a0-6a86bf7ac21e',
+  'e4448857-fa0c-403b-ad69-f0a353458b9d'
+];
+const fs = require('fs');
 
 //init svg
-data.ProcessInstanceData.forEach(datum =>{
-  if(processSvg.includes(datum.id)){
+data.ProcessInstanceData.forEach((datum) => {
+  if (processSvg.includes(datum.id)) {
     if (datum.processId === 'travels') {
-      console.log('travels');
-      datum.diagram =  fs.readFileSync(__dirname+'/static/travels.svg', 'utf8') ;
+      datum.diagram = fs.readFileSync(
+        __dirname + '/static/travels.svg',
+        'utf8'
+      );
     } else if (datum.processId === 'flightBooking') {
-      datum.diagram = fs.readFileSync(__dirname+'/static/flightBooking.svg');
+      datum.diagram = fs.readFileSync(__dirname + '/static/flightBooking.svg');
     } else if (datum.processId === 'hotelBooking') {
-      datum.diagram = fs.readFileSync(__dirname+'/static/hotelBooking.svg');
+      datum.diagram = fs.readFileSync(__dirname + '/static/hotelBooking.svg');
     }
   } else {
     datum.diagram = null;
   }
-  if (datum.processId !== null || datum.processId !== undefined){
+  if (datum.processId !== null || datum.processId !== undefined) {
     datum.nodeDefinitions = [
       {
-        nodeDefinitionId: "_BDA56801-1155-4AF2-94D4-7DAADED2E3C0",
-        name: "Send visa application",
+        nodeDefinitionId: '_BDA56801-1155-4AF2-94D4-7DAADED2E3C0',
+        name: 'Send visa application',
         id: 1,
-        type: "ActionNode",
-        uniqueId: "1"
+        type: 'ActionNode',
+        uniqueId: '1'
       },
       {
-        nodeDefinitionId: "_175DC79D-C2F1-4B28-BE2D-B583DFABF70D",
-        name: "Book",
+        nodeDefinitionId: '_175DC79D-C2F1-4B28-BE2D-B583DFABF70D',
+        name: 'Book',
         id: 2,
-        type: "Split",
-        uniqueId: "2"
+        type: 'Split',
+        uniqueId: '2'
       },
       {
-        nodeDefinitionId: "_E611283E-30B0-46B9-8305-768A002C7518",
-        name: "visasrejected",
+        nodeDefinitionId: '_E611283E-30B0-46B9-8305-768A002C7518',
+        name: 'visasrejected',
         id: 3,
-        type: "EventNode",
-        uniqueId: "3"
+        type: 'EventNode',
+        uniqueId: '3'
       }
     ];
-  }else{
+  } else {
     datum.nodeDefinition = null;
   }
 });
@@ -236,9 +275,12 @@ data.ProcessInstanceData.forEach(datum =>{
 const resolvers = {
   Mutation: {
     ProcessInstanceRetry: async (parent, args) => {
-      const successRetryInstances = ['8035b580-6ae4-4aa8-9ec0-e18e19809e0b2', '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3']
+      const successRetryInstances = [
+        '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
+        '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3'
+      ];
       const { process } = mutationRestData.management;
-      const processInstance = process.filter(data => {
+      const processInstance = process.filter((data) => {
         return data.processInstanceId === args['id'];
       });
       if (successRetryInstances.includes(processInstance[0].id)) {
@@ -249,7 +291,7 @@ const resolvers = {
     },
     ProcessInstanceSkip: async (parent, args) => {
       const { process } = mutationRestData.management;
-      const processInstance = process.filter(data => {
+      const processInstance = process.filter((data) => {
         return data.processInstanceId === args['id'];
       });
 
@@ -257,28 +299,36 @@ const resolvers = {
     },
 
     ProcessInstanceAbort: async (parent, args) => {
-      const failedAbortInstances = ['8035b580-6ae4-4aa8-9ec0-e18e19809e0b2', '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3']
+      const failedAbortInstances = [
+        '8035b580-6ae4-4aa8-9ec0-e18e19809e0b2',
+        '8035b580-6ae4-4aa8-9ec0-e18e19809e0b3'
+      ];
       const { process } = mutationRestData.management;
-      const processInstance = process.filter(data => {
+      const processInstance = process.filter((data) => {
         return data.processInstanceId === args['id'];
       });
       if (failedAbortInstances.includes(processInstance[0].id)) {
         return 'process not found';
-      }else {
-        setProcessInstanceState(processInstance[0].processInstanceId, 'ABORTED');
+      } else {
+        setProcessInstanceState(
+          processInstance[0].processInstanceId,
+          'ABORTED'
+        );
         processInstance[0].state = 'ABORTED';
         return processInstance[0].abort;
       }
     },
 
-    ProcessInstanceUpdateVariables: async (parent, args) =>{
-      const processInstance = data.ProcessInstanceData.filter(datum => {return datum.id === args['id']});
-      processInstance [0].variables = args['variables'];
-      return processInstance [0].variables;
+    ProcessInstanceUpdateVariables: async (parent, args) => {
+      const processInstance = data.ProcessInstanceData.filter((datum) => {
+        return datum.id === args['id'];
+      });
+      processInstance[0].variables = args['variables'];
+      return processInstance[0].variables;
     },
 
-    NodeInstanceTrigger: async(parent, args) =>{
-      const nodeData = data.ProcessInstanceData.filter(data => {
+    NodeInstanceTrigger: async (parent, args) => {
+      const nodeData = data.ProcessInstanceData.filter((data) => {
         return data.id === args['id'];
       });
       const nodeObject = nodeData[0].nodes.filter((node, index) => {
@@ -297,37 +347,39 @@ const resolvers = {
       }
     },
 
-    NodeInstanceCancel: async(parent, args) =>{
-      const nodeData = data.ProcessInstanceData.filter(data => {
+    NodeInstanceCancel: async (parent, args) => {
+      const nodeData = data.ProcessInstanceData.filter((data) => {
         return data.id === args['id'];
       });
-      const nodeObject = nodeData[0].nodes.filter(node => node.id === args['nodeInstanceId']);
+      const nodeObject = nodeData[0].nodes.filter(
+        (node) => node.id === args['nodeInstanceId']
+      );
       if (nodeObject[0].name.includes('not found')) {
         throw new Error('node not found');
-      }
-      else {
+      } else {
         nodeObject[0].exit = new Date().toISOString();
         return nodeObject[0];
       }
     },
 
-    NodeInstanceRetrigger: async(parent, args) =>{
-      const nodeData = data.ProcessInstanceData.filter(data => {
+    NodeInstanceRetrigger: async (parent, args) => {
+      const nodeData = data.ProcessInstanceData.filter((data) => {
         return data.id === args['id'];
       });
-      const nodeObject = nodeData[0].nodes.filter(node => node.id === args['nodeInstanceId']);
+      const nodeObject = nodeData[0].nodes.filter(
+        (node) => node.id === args['nodeInstanceId']
+      );
       if (nodeObject[0].name.includes('not found')) {
         throw new Error('node not found');
-      }
-      else {
+      } else {
         nodeObject[0].exit = new Date().toISOString();
         return nodeObject[0];
       }
     },
 
-    JobCancel: async(parent, args) =>{
-      const mockFailedJobs = ['dad3aa88-5c1e-4858-a919-6123c675a0fa_0']
-      const jobData = data.JobsData.filter(job => job.id === args['id']);
+    JobCancel: async (parent, args) => {
+      const mockFailedJobs = ['dad3aa88-5c1e-4858-a919-6123c675a0fa_0'];
+      const jobData = data.JobsData.filter((job) => job.id === args['id']);
       if (mockFailedJobs.includes(jobData[0].id) || jobData.length === 0) {
         return 'job not found';
       } else {
@@ -337,20 +389,24 @@ const resolvers = {
       }
     },
 
-    JobReschedule: async(parent, args) =>{
-      const data = data.JobsData.find(data => {
+    JobReschedule: async (parent, args) => {
+      const data = data.JobsData.find((data) => {
         return data.id === args['id'];
       });
-      if (args['id'] !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0" && args['data'].repeatInterval && args['data'].repeatLimit) {
+      if (
+        args['id'] !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0' &&
+        args['data'].repeatInterval &&
+        args['data'].repeatLimit
+      ) {
         data.expirationTime = args['data'].expirationTime;
         data.repeatInterval = args['data'].repeatInterval;
         data.repeatLimit = args['data'].repeatLimit;
       } else {
-        if (args['id'] !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0") {
+        if (args['id'] !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0') {
           data.expirationTime = args['data'].expirationTime;
         }
       }
-      if (args['id'] !== "eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0") {
+      if (args['id'] !== 'eff4ee-11qw23-6675-pokau97-qwedjut45a0fa_0') {
         return data;
       } else {
         return 'job not rescheduled';
@@ -360,7 +416,7 @@ const resolvers = {
 
   Query: {
     ProcessInstances: async (parent, args) => {
-      let result = data.ProcessInstanceData.filter(datum => {
+      let result = data.ProcessInstanceData.filter((datum) => {
         console.log('args', args['where']);
         if (args['where'].id && args['where'].id.equal) {
           return datum.id == args['where'].id.equal;
@@ -372,7 +428,10 @@ const resolvers = {
             datum.rootProcessInstanceId ==
             args['where'].rootProcessInstanceId.equal
           );
-        } else if (args['where'].parentProcessInstanceId && args['where'].parentProcessInstanceId.equal) {
+        } else if (
+          args['where'].parentProcessInstanceId &&
+          args['where'].parentProcessInstanceId.equal
+        ) {
           return (
             datum.parentProcessInstanceId ==
             args['where'].parentProcessInstanceId.equal
@@ -412,11 +471,11 @@ const resolvers = {
         }
       });
       if (args['orderBy']) {
-        console.log('orderBy args: ', args['orderBy'])
+        console.log('orderBy args: ', args['orderBy']);
         result = _.orderBy(
           result,
-          _.keys(args['orderBy']).map(key => key),
-          _.values(args['orderBy']).map(value => value.toLowerCase())
+          _.keys(args['orderBy']).map((key) => key),
+          _.values(args['orderBy']).map((value) => value.toLowerCase())
         );
       }
       await timeout(2000);
@@ -432,34 +491,42 @@ const resolvers = {
     },
     Jobs: async (parent, args) => {
       if (Object.keys(args).length > 0) {
-        const result = data.JobsData.filter(jobData => {
-          console.log('Job data args->', args['where'].processInstanceId)
-          if (args['where'].processInstanceId && args['where'].processInstanceId.equal) {
-            return jobData.processInstanceId == args['where'].processInstanceId.equal;
+        const result = data.JobsData.filter((jobData) => {
+          console.log('Job data args->', args['where'].processInstanceId);
+          if (
+            args['where'].processInstanceId &&
+            args['where'].processInstanceId.equal
+          ) {
+            return (
+              jobData.processInstanceId == args['where'].processInstanceId.equal
+            );
           } else if (args['where'].status && args['where'].status.in) {
-            return args['where'].status.in.includes(jobData.status)
+            return args['where'].status.in.includes(jobData.status);
           }
         });
-        console.log('orderby', args['orderBy'])
+        console.log('orderby', args['orderBy']);
         await timeout(2000);
         if (args['orderBy'] && Object.values(args['orderBy'])[0] === 'ASC') {
-          const orderArg = Object.keys(args['orderBy'])[0]
+          const orderArg = Object.keys(args['orderBy'])[0];
           result.sort((a, b) => {
             if (orderArg === 'lastUpdate' || orderArg === 'expirationTime') {
-              return new Date(a[orderArg]) - new Date(b[orderArg])
+              return new Date(a[orderArg]) - new Date(b[orderArg]);
             } else if (orderArg === 'status') {
-              return a[orderArg].localeCompare(b[orderArg])
+              return a[orderArg].localeCompare(b[orderArg]);
             } else {
               return a[orderArg] - b[orderArg];
             }
-          })
-        } else if (args['orderBy'] && Object.values(args['orderBy'])[0] === 'DESC') {
-          const orderArg = Object.keys(args['orderBy'])[0]
+          });
+        } else if (
+          args['orderBy'] &&
+          Object.values(args['orderBy'])[0] === 'DESC'
+        ) {
+          const orderArg = Object.keys(args['orderBy'])[0];
           result.sort((a, b) => {
             if (orderArg === 'lastUpdate' || orderArg === 'expirationTime') {
-              return new Date(b[orderArg]) - new Date(a[orderArg])
+              return new Date(b[orderArg]) - new Date(a[orderArg]);
             } else if (orderArg === 'status') {
-              return b[orderArg].localeCompare(a[orderArg])
+              return b[orderArg].localeCompare(a[orderArg]);
             } else {
               return b[orderArg] - a[orderArg];
             }
@@ -477,7 +544,7 @@ const resolvers = {
       }
     },
     UserTaskInstances: async (parent, args) => {
-      let result = data.UserTaskInstances.filter(datum => {
+      let result = data.UserTaskInstances.filter((datum) => {
         console.log('args', args);
 
         if (args['where'].and) {
@@ -521,8 +588,8 @@ const resolvers = {
       if (args['orderBy']) {
         result = _.orderBy(
           result,
-          _.keys(args['orderBy']).map(key => key),
-          _.values(args['orderBy']).map(value => value.toLowerCase())
+          _.keys(args['orderBy']).map((key) => key),
+          _.values(args['orderBy']).map((value) => value.toLowerCase())
         );
       }
       await timeout(2000);
@@ -580,4 +647,4 @@ module.exports = {
   getApp: () => app,
   setPort,
   listen
-};
\ No newline at end of file
+};
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/CustomLabels.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/CustomLabels.ts
index ee2e424fc6..c68d7fcb9b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/CustomLabels.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/CustomLabels.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface CustomLabels {
   singularProcessLabel: string;
   pluralProcessLabel: string;
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIChannelApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIChannelApi.ts
index 879d923e03..d220f97e17 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIChannelApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIChannelApi.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 // eslint-disable-next-line  @typescript-eslint/no-empty-interface
 export interface RuntimeToolsDevUIChannelApi {}
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIEnvelopeApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIEnvelopeApi.ts
index 3b160c688c..14f0dfab44 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIEnvelopeApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/RuntimeToolsDevUIEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CustomLabels } from './CustomLabels';
 import { DiagramPreviewSize } from '@kogito-apps/process-details/dist/api';
 
@@ -47,5 +49,4 @@ export interface RuntimeToolsDevUIInitArgs {
   customLabels: CustomLabels;
   omittedProcessTimelineEvents?: string[];
   diagramPreviewSize?: DiagramPreviewSize;
-  isStunnerEnabled: boolean;
 }
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/index.ts
index ecd491822f..1956232a4b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/api/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './RuntimeToolsDevUIChannelApi';
 export * from './RuntimeToolsDevUIEnvelopeApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContext.ts
index 32fb9670d9..68a438f9f8 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { CloudEventFormGatewayApi } from './CloudEventFormGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContextProvider.tsx
index d12000c60c..ffdd3a723c 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useMemo } from 'react';
 import {
   DevUIAppContext,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormGatewayApi.ts
index c71fda49ab..ba4fab372a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/CloudEventFormGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CloudEventRequest } from '@kogito-apps/cloud-event-form';
 import { triggerCloudEvent, triggerStartCloudEvent } from '../apis';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/index.ts
index c05db68f0f..a562131344 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CloudEventForm/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { CloudEventFormGatewayApi } from './CloudEventFormGatewayApi';
 export * from './CloudEventFormContext';
 export { default as CloudEventFormContextProvider } from './CloudEventFormContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContext.ts
index 09aef12a05..59038dd2f9 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { CustomDashboardListGatewayApi } from './CustomDashboardListGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContextProvider.tsx
index aee6947d46..c5340f628a 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import CustomDashboardListContext from './CustomDashboardListContext';
 import { CustomDashboardListGatewayApiImpl } from './CustomDashboardListGatewayApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListGatewayApi.ts
index cdebfbad02..46046babfe 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/CustomDashboardListGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardFilter,
   CustomDashboardInfo
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/index.ts
index 54a32b4c70..32a0fc81c6 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { CustomDashboardListGatewayApi } from './CustomDashboardListGatewayApi';
 export * from './CustomDashboardListContext';
 export { default as CustomDashboardListContextProvider } from './CustomDashboardListContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/tests/CustomDashboardListGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/tests/CustomDashboardListGatewayApi.test.ts
index 386e36f3a7..7f53d8dcfc 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/tests/CustomDashboardListGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardList/tests/CustomDashboardListGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardListGatewayApi,
   CustomDashboardListGatewayApiImpl,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContext.ts
index e2f2eedf33..b6eda75346 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { CustomDashboardViewGatewayApi } from './CustomDashboardViewGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContextProvider.tsx
index aa276d9985..680f2b9991 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import CustomDashboardViewContext from './CustomDashboardViewContext';
 import { CustomDashboardViewGatewayApiImpl } from './CustomDashboardViewGatewayApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewGatewayApi.ts
index df48b2e05e..cf80235e5a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/CustomDashboardViewGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
 import { getCustomDashboardContent } from '../apis';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/index.ts
index c5eef94c5b..dfbc971580 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { CustomDashboardViewGatewayApi } from './CustomDashboardViewGatewayApi';
 export * from './CustomDashboardViewContext';
 export { default as CustomDashboardViewContextProvider } from './CustomDashboardViewContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/tests/CustomDashboardViewGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/tests/CustomDashboardViewGatewayApi.test.ts
index a17dd51108..b1d1c6da26 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/tests/CustomDashboardViewGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/CustomDashboardView/tests/CustomDashboardViewGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   CustomDashboardViewGatewayApi,
   CustomDashboardViewGatewayApiImpl
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContext.ts
index ad19de929a..48a086c407 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { FormDetailsGatewayApi } from './FormDetailsGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContextProvider.tsx
index 46c1680f7e..cbcfc31b2e 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import FormDetailsContext from './FormDetailsContext';
 import { FormDetailsGatewayApiImpl } from './FormDetailsGatewayApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsGatewayApi.ts
index f60dbc3360..b56035a49c 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/FormDetailsGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { Form, FormContent } from '@kogito-apps/form-details';
 
 import { getFormContent, saveFormContent } from '../apis';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/index.ts
index fa037a8905..ecc7bb3dee 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { FormDetailsGatewayApi } from './FormDetailsGatewayApi';
 export * from './FormDetailsContext';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/tests/FormDetailsGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/tests/FormDetailsGatewayApi.test.ts
index 093ce82274..be4e69351d 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/tests/FormDetailsGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormDetails/tests/FormDetailsGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormContent } from '@kogito-apps/form-details/dist/api/FormDetailsEnvelopeApi';
 import { getFormContent, saveFormContent } from '../../apis/apis';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContext.ts
index 6519cec2fa..24997f2c71 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { FormsListGatewayApi } from './FormsListGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContextProvider.tsx
index f5832de591..ab09ea58a0 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import FormsListContext from './FormsListContext';
 import { FormsListGatewayApiImpl } from './FormsListGatewayApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListGatewayApi.ts
index 4a48310619..999bd866c5 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/FormsListGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormFilter, FormInfo } from '@kogito-apps/forms-list';
 import { getForms } from '../apis';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/index.ts
index aab493343f..65f8969eb3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { FormsListGatewayApi } from './FormsListGatewayApi';
 export * from './FormsListContext';
 export { default as FormsListContextProvider } from './FormsListContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/tests/FormsListGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/tests/FormsListGatewayApi.test.ts
index 56158ee6c2..01e2337c23 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/tests/FormsListGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/FormsList/tests/FormsListGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { FormInfo } from '@kogito-apps/forms-list';
 import {
   FormsListGatewayApi,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContext.ts
index 0cfac247d0..3f95855145 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { JobsManagementGatewayApi } from './JobsManagementGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx
index 4ce2277a7a..57a5b66529 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ApolloClient } from 'apollo-client';
 import JobsManagementContext from './JobsManagementContext';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts
index c6161f1e28..15be78532b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   Job,
   JobStatus,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementQueries.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementQueries.ts
index 8adbeb77b8..fdf675e762 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementQueries.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/JobsManagementQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import {
   Job,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/index.ts
index 2ee783bbee..90eb2c3b3c 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { JobsManagementGatewayApi } from './JobsManagementGatewayApi';
 export * from './JobsManagementContext';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts
index e6956b2abd..c587a59018 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { JobsManagementQueries } from '../JobsManagementQueries';
 import {
   Job,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts
index 799b3a2b59..e70d6610fa 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/JobsManagement/tests/JobsManagementQueries.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { act } from 'react-dom/test-utils';
 import reactApollo from 'react-apollo';
 import { GraphQLJobsManagementQueries } from '../JobsManagementQueries';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContext.ts
index 095eed332e..b1dbc2e0fc 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { ProcessDefinitionListGatewayApi } from './ProcessDefinitionListGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContextProvider.tsx
index 32f6dbc9a6..694bd721fe 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useMemo } from 'react';
 import {
   DevUIAppContext,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListGatewayApi.ts
index c56b5b1ccb..abf868d6e9 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/ProcessDefinitionListGatewayApi.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { ProcessDefinition } from '@kogito-apps/process-definition-list';
 import { getProcessDefinitionList } from '../apis';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/index.ts
index e534418579..9c8bfe7711 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { ProcessDefinitionListGatewayApi } from './ProcessDefinitionListGatewayApi';
 export * from './ProcessDefinitionListContext';
 export { default as ProcessDefinitionListContextProvider } from './ProcessDefinitionListContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/tests/ProcessDefinitionListGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/tests/ProcessDefinitionListGatewayApi.test.ts
index 6e612f917b..39f7d5bc17 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/tests/ProcessDefinitionListGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDefinitionList/tests/ProcessDefinitionListGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition } from '@kogito-apps/process-definition-list';
 import { getProcessDefinitionList } from '../../apis';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts
index f5276a5e5d..727f418457 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { ProcessDetailsGatewayApi } from './ProcessDetailsGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx
index d1765cd180..846e1e7579 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ApolloClient } from 'apollo-client';
 import ProcessDetailsContext from './ProcessDetailsContext';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts
index 26b5ef3854..25eade0f25 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDetailsQueries } from './ProcessDetailsQueries';
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts
index 2283a30bfb..00b1b7b55e 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/ProcessDetailsQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import {
   ProcessInstance,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/index.ts
index 690f17c159..92a52bc815 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { ProcessDetailsGatewayApi } from './ProcessDetailsGatewayApi';
 export * from './ProcessDetailsContext';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts
index 9f862b4c92..20d8472381 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDetailsQueries } from '../ProcessDetailsQueries';
 import {
   Job,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts
index 1242f1aa0a..0c334fc618 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessDetails/tests/ProcessDetailsQueries.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { act } from 'react-dom/test-utils';
 import reactApollo from 'react-apollo';
 import { GraphQLProcessDetailsQueries } from '../ProcessDetailsQueries';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContext.ts
index d78a989208..2c500f535a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { ProcessFormGatewayApi } from './ProcessFormGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContextProvider.tsx
index 13eb46564e..647162adf8 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import ProcessFormContext from './ProcessFormContext';
 import { ProcessFormGatewayApiImpl } from './ProcessFormGatewayApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormGatewayApi.ts
index c0b8aacaa2..c051d77d22 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/ProcessFormGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition } from '@kogito-apps/process-definition-list';
 import { getProcessSchema, startProcessInstance } from '../apis';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/tests/ProcessFormGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/tests/ProcessFormGatewayApi.test.ts
index 4805f78be4..a801d9de22 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/tests/ProcessFormGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessForm/tests/ProcessFormGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ProcessDefinition } from '@kogito-apps/process-definition-list';
 import { getProcessSchema, startProcessInstance } from '../../apis';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContext.ts
index 002e2ab518..78c332c5ac 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { ProcessListGatewayApi } from './ProcessListGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx
index 030f1a0f6b..c0828665d0 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useMemo } from 'react';
 import { ApolloClient } from 'apollo-client';
 import ProcessListContext from './ProcessListContext';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts
index 737f016bea..5ce106cd70 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListGatewayApi.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListQueries.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListQueries.ts
index c27f9289e2..5d1b5b8e7c 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListQueries.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/ProcessListQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/index.ts
index 466cb8333a..7cbbd9a3ec 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { ProcessListGatewayApi } from './ProcessListGatewayApi';
 export * from './ProcessListContext';
 export { default as ProcessListContextProvider } from './ProcessListContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx
index 0325233839..f512ed9263 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/ProcessList/tests/ProcessListGatewayApi.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ProcessInstance,
   ProcessInstanceState,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContext.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContext.tsx
index bdae5a6fad..92c0c2300e 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContext.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContext.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { TaskFormGatewayApi } from './TaskFormGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContextProvider.tsx
index fa435c94d5..0ec2ce5ef2 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { useDevUIAppContext } from '../../components/contexts/DevUIAppContext';
 import { TaskFormGatewayApiImpl } from './TaskFormGatewayApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormGatewayApi.ts
index b1c9579ee4..fa236acde9 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/TaskFormGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import axios from 'axios';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/index.ts
index 7617c54c5c..60f1a7e5c3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { TaskFormGatewayApi } from './TaskFormGatewayApi';
 export * from './TaskFormContext';
 export { default as TaskFormContextProvider } from './TaskFormContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/TaskFormGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/TaskFormGatewayApi.test.ts
index b4952f5e82..6086ec8ae3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/TaskFormGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/TaskFormGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import axios from 'axios';
 import _ from 'lodash';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/mocks/Mocks.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/mocks/Mocks.ts
index 65a88939a7..2d52a84705 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskForms/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export const ApplyForVisaForm = {
   type: 'object',
   properties: {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContext.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContext.tsx
index a4de852983..fa0afe11d8 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContext.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContext.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { TaskInboxGatewayApi } from './TaskInboxGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContextProvider.tsx
index 9c11ac2c86..3168c58341 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ApolloClient } from 'apollo-client';
 import { useDevUIAppContext } from '../../components/contexts/DevUIAppContext';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxGatewayApi.ts
index 5af4e3045b..56ddf04eb4 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { QueryFilter, SortBy, TaskInboxState } from '@kogito-apps/task-inbox';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import { TaskInboxQueries } from './TaskInboxQueries';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxQueries.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxQueries.ts
index d0348ab3e0..b91346fcae 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxQueries.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/TaskInboxQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import { SortBy, QueryFilter } from '@kogito-apps/task-inbox';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/index.ts
index 46c35c76a1..ded3e2ca54 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { TaskInboxGatewayApi } from './TaskInboxGatewayApi';
 export * from './TaskInboxContext';
 export { default as TaskInboxContextProvider } from './TaskInboxContextProvider';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/tests/TaskInboxGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/tests/TaskInboxGatewayApi.test.ts
index 37ea9db5af..d0f80c89a5 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/tests/TaskInboxGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/TaskInbox/tests/TaskInboxGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { TaskInboxQueries } from '../TaskInboxQueries';
 import { QueryFilter, SortBy, TaskInboxState } from '@kogito-apps/task-inbox';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContext.ts
index 66ffac8307..4942446317 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { WorkflowFormGatewayApi } from './WorkflowFormGatewayApi';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContextProvider.tsx
index 14f61cba75..76ceab2ca6 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import WorkflowFormContext from './WorkflowFormContext';
 import { WorkflowFormGatewayApiImpl } from './WorkflowFormGatewayApi';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormGatewayApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormGatewayApi.ts
index 1cde2c1c98..86ee18abe8 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormGatewayApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/WorkflowFormGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { getCustomWorkflowSchema, startWorkflowRest } from '../apis';
 
 export interface WorkflowFormGatewayApi {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/tests/WorkflowFormGatewayApi.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/tests/WorkflowFormGatewayApi.test.ts
index 1d287854c7..ccefbe8021 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/tests/WorkflowFormGatewayApi.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/WorkflowForm/tests/WorkflowFormGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { getCustomWorkflowSchema, startWorkflowRest } from '../../apis';
 import {
   WorkflowFormGatewayApi,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx
index e818de41e5..732cb2be9c 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/apis.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 import {
   BulkProcessInstanceActionResponse,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/index.ts
index 8bf1d798f7..09f8a8e884 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './apis';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx
index ba32660dc4..63f768c46c 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/channel/apis/tests/apis.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import axios from 'axios';
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 import wait from 'waait';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx
index a1281d750b..343346748b 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import { ApolloProvider } from 'react-apollo';
@@ -51,7 +53,6 @@ interface IOwnProps {
   customLabels: CustomLabels;
   omittedProcessTimelineEvents?: string[];
   diagramPreviewSize?: DiagramPreviewSize;
-  isStunnerEnabled: boolean;
 }
 
 const DevUILayout: React.FC<IOwnProps> = ({
@@ -65,7 +66,6 @@ const DevUILayout: React.FC<IOwnProps> = ({
   customLabels,
   omittedProcessTimelineEvents,
   diagramPreviewSize,
-  isStunnerEnabled,
   children
 }) => {
   const renderPage = (routeProps) => {
@@ -92,7 +92,6 @@ const DevUILayout: React.FC<IOwnProps> = ({
         customLabels={customLabels}
         omittedProcessTimelineEvents={omittedProcessTimelineEvents}
         diagramPreviewSize={diagramPreviewSize}
-        isStunnerEnabled={isStunnerEnabled}
       >
         <TaskConsoleContextsProvider apolloClient={apolloClient}>
           <TaskFormContextProvider>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/__mocks__/DevUILayout.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/__mocks__/DevUILayout.tsx
index 819d45e1d6..17aee9a742 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/__mocks__/DevUILayout.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/__mocks__/DevUILayout.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedDevUILayout = () => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/tests/DevUILayout.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/tests/DevUILayout.test.tsx
index 0f5c668bf6..ff6936feda 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/tests/DevUILayout.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUILayout/tests/DevUILayout.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import DevUILayout from '../DevUILayout';
@@ -41,8 +43,7 @@ describe('DevUILayout tests', () => {
       customLabels: {
         singularProcessLabel: 'Workflow',
         pluralProcessLabel: 'Workflows'
-      },
-      isStunnerEnabled: false
+      }
     };
     const { container } = render(
       <DevUILayout {...props}>
@@ -87,8 +88,7 @@ describe('DevUILayout tests', () => {
       customLabels: {
         singularProcessLabel: 'Workflow',
         pluralProcessLabel: 'Workflows'
-      },
-      isStunnerEnabled: false
+      }
     };
     const { container } = render(
       <DevUILayout {...props}>
@@ -134,8 +134,7 @@ describe('DevUILayout tests', () => {
       customLabels: {
         singularProcessLabel: 'Workflow',
         pluralProcessLabel: 'Workflows'
-      },
-      isStunnerEnabled: false
+      }
     };
     const { container } = render(
       <DevUILayout {...props}>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx
index 88484220e2..b197da5536 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   Nav,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/tests/DevUINav.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/tests/DevUINav.test.tsx
index b8167874ef..6a29ec080d 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/tests/DevUINav.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUINav/tests/DevUINav.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import DevUINav from '../DevUINav';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx
index 75d70f9efd..e78571f179 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useMemo } from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import { JobsManagementPage, ProcessesPage } from '../../pages';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/__mocks__/DevUIRoutes.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/__mocks__/DevUIRoutes.tsx
index 3dc512aada..88a74003c2 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/__mocks__/DevUIRoutes.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/__mocks__/DevUIRoutes.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedDevUIRoutes = () => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/tests/DevUIRoutes.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/tests/DevUIRoutes.test.tsx
index e697acc375..c95967490a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/tests/DevUIRoutes.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/DevUIRoutes/tests/DevUIRoutes.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import DevUIRoutes from '../DevUIRoutes';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/RuntimeTools.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/RuntimeTools.tsx
index e0fa7180c1..4c8c8d0924 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/RuntimeTools.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/RuntimeTools.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { HttpLink } from 'apollo-link-http';
 import { onError } from 'apollo-link-error';
@@ -40,7 +42,6 @@ interface IOwnProps {
   customLabels: CustomLabels;
   omittedProcessTimelineEvents: string[];
   diagramPreviewSize?: DiagramPreviewSize;
-  isStunnerEnabled: boolean;
 }
 
 const RuntimeTools: React.FC<IOwnProps> = ({
@@ -55,8 +56,7 @@ const RuntimeTools: React.FC<IOwnProps> = ({
   availablePages,
   customLabels,
   omittedProcessTimelineEvents,
-  diagramPreviewSize,
-  isStunnerEnabled
+  diagramPreviewSize
 }) => {
   const httpLink = new HttpLink({
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -79,7 +79,6 @@ const RuntimeTools: React.FC<IOwnProps> = ({
           customLabels={customLabels}
           omittedProcessTimelineEvents={omittedProcessTimelineEvents}
           diagramPreviewSize={diagramPreviewSize}
-          isStunnerEnabled={isStunnerEnabled}
         >
           <ServerUnavailablePage
             displayName={'Runtime Dev UI'}
@@ -109,7 +108,6 @@ const RuntimeTools: React.FC<IOwnProps> = ({
       customLabels={customLabels}
       omittedProcessTimelineEvents={omittedProcessTimelineEvents}
       diagramPreviewSize={diagramPreviewSize}
-      isStunnerEnabled={isStunnerEnabled}
     >
       <DevUIRoutes
         navigate={navigate}
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/__mocks__/RuntimeTools.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/__mocks__/RuntimeTools.tsx
index 15a511fe3c..44c1ba07a9 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/__mocks__/RuntimeTools.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/__mocks__/RuntimeTools.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const RuntimeTools = () => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/tests/RuntimeTools.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/tests/RuntimeTools.test.tsx
index 462edf966e..11a42fa16c 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/tests/RuntimeTools.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/RuntimeTools/tests/RuntimeTools.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { render } from '@testing-library/react';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/index.ts
index 22eed47f64..c5ba7cb233 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/DevUI/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as DevUILayout } from './DevUILayout/DevUILayout';
 export { default as DevUINav } from './DevUINav/DevUINav';
 export { default as DevUIRoutes } from './DevUIRoutes/DevUIRoutes';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/CloudEventFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/CloudEventFormContainer.tsx
index f2480c2c7e..7986c9174f 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/CloudEventFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/CloudEventFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/__mocks__/CloudEventFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/__mocks__/CloudEventFormContainer.tsx
index 5d6077df1b..1ea01fafc7 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/__mocks__/CloudEventFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/__mocks__/CloudEventFormContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/tests/CloudEventFormContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/tests/CloudEventFormContainer.test.tsx
index ab10979f59..f64524aee8 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/tests/CloudEventFormContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CloudEventFormContainer/tests/CloudEventFormContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import CloudEventFormContainer, {
@@ -60,7 +62,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/CustomDashboardListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/CustomDashboardListContainer.tsx
index 04f6576182..9dd082c1d3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/CustomDashboardListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/CustomDashboardListContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { OUIAProps } from '@kogito-apps/ouia-tools/dist/utils/OuiaUtils';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/__mocks__/CustomDashboardListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/__mocks__/CustomDashboardListContainer.tsx
index 98f0720668..a10210f1bd 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/__mocks__/CustomDashboardListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/__mocks__/CustomDashboardListContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/tests/CustomDashboardListContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/tests/CustomDashboardListContainer.test.tsx
index e4d94e268a..0e4d52a6f5 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/tests/CustomDashboardListContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardListContainer/tests/CustomDashboardListContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import CustomDashboardListContainer from '../CustomDashboardListContainer';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/CustomDashboardViewContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/CustomDashboardViewContainer.tsx
index 58635c86df..48de681274 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/CustomDashboardViewContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/CustomDashboardViewContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/__mocks__/CustomDashboardViewContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/__mocks__/CustomDashboardViewContainer.tsx
index c127fc908c..911d702381 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/__mocks__/CustomDashboardViewContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/__mocks__/CustomDashboardViewContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/tests/CustomDashboardViewContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/tests/CustomDashboardViewContainer.test.tsx
index a8ac885c9b..a4b9725827 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/tests/CustomDashboardViewContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/CustomDashboardViewContainer/tests/CustomDashboardViewContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import CustomDashboardViewContainer from '../CustomDashboardViewContainer';
@@ -37,7 +39,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/FormDetailsContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/FormDetailsContainer.tsx
index 9cbe4e6ecf..3195e2844a 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/FormDetailsContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/FormDetailsContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/__mocks__/FormDetailsContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/__mocks__/FormDetailsContainer.tsx
index 097ddaaf40..f71c300e78 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/__mocks__/FormDetailsContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/__mocks__/FormDetailsContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedFormDetailsContainer = ({
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/tests/FormDetailsContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/tests/FormDetailsContainer.test.tsx
index 5d49d472b4..181aef15d9 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/tests/FormDetailsContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormDetailsContainer/tests/FormDetailsContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import FormDetailsContainer from '../FormDetailsContainer';
@@ -37,7 +39,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx
index bd849e7e4e..6006c69f00 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { OUIAProps } from '@kogito-apps/ouia-tools/dist/utils/OuiaUtils';
 import { EmbeddedFormsList, FormInfo } from '@kogito-apps/forms-list';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/__mocks__/FormsListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/__mocks__/FormsListContainer.tsx
index 799f3264e1..750e480a99 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/__mocks__/FormsListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/__mocks__/FormsListContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/tests/FormsListContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/tests/FormsListContainer.test.tsx
index e163d35c52..d3961e2073 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/tests/FormsListContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/FormsListContainer/tests/FormsListContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import FormsListContainer from '../FormsListContainer';
@@ -37,7 +39,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx
index 6ccd727978..71fb1c5556 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/JobsManagementContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx
index edf5154133..c1258028bb 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/JobsManagementContainer/tests/JosManagementContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { render } from '@testing-library/react';
 import React from 'react';
 import JobsManagementContainer from '../JobsManagementContainer';
@@ -30,7 +32,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/MonitoringContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/MonitoringContainer.tsx
index f8c466d4be..5450016daa 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/MonitoringContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/MonitoringContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { Dashboard, MonitoringView } from '@kogito-apps/monitoring';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/tests/MonitoringContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/tests/MonitoringContainer.test.tsx
index 692ca78bcf..e37e3acc29 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/tests/MonitoringContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/MonitoringContainer/tests/MonitoringContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import MonitoringContainer from '../MonitoringContainer';
 import { act, render } from '@testing-library/react';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx
index d8c9f2b666..ab26f03516 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/__mocks__/ProcessDefinitionListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/__mocks__/ProcessDefinitionListContainer.tsx
index a4f24d5a5c..bddaa350da 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/__mocks__/ProcessDefinitionListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/__mocks__/ProcessDefinitionListContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/tests/ProcessDefinitionListContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/tests/ProcessDefinitionListContainer.test.tsx
index a70fa80a35..e17ecfb41b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/tests/ProcessDefinitionListContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/tests/ProcessDefinitionListContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import ProcessDefinitionListContainer from '../ProcessDefinitionListContainer';
@@ -43,7 +45,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
index d218f80ac4..653bd70dcb 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import {
   componentOuiaProps,
@@ -57,7 +59,6 @@ const ProcessDetailsContainer: React.FC<
       omittedProcessTimelineEvents={appContext.omittedProcessTimelineEvents}
       diagramPreviewSize={appContext.diagramPreviewSize}
       showSwfDiagram={appContext.isWorkflow()}
-      isStunnerEnabled={appContext.getIsStunnerEnabled()}
       singularProcessLabel={appContext.customLabels.singularProcessLabel}
       pluralProcessLabel={appContext.customLabels.pluralProcessLabel}
     />
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx
index c71fb0d15d..e351125198 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/tests/ProcessDetailsContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import { ProcessInstance } from '@kogito-apps/management-console-shared/dist/types';
@@ -71,7 +73,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/ProcessFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/ProcessFormContainer.tsx
index 69eba2af94..db2f7a3724 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/ProcessFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/ProcessFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/__mocks__/ProcessFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/__mocks__/ProcessFormContainer.tsx
index 649a721728..c121d895d2 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/__mocks__/ProcessFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/__mocks__/ProcessFormContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/tests/ProcessFormContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/tests/ProcessFormContainer.test.tsx
index c9086a0d17..7007aa6a55 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/tests/ProcessFormContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessFormContainer/tests/ProcessFormContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import ProcessFormContainer from '../ProcessFormContainer';
@@ -52,7 +54,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
index 787b034406..8b1106c316 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx
index 98c1f9ddae..c53a7af7ee 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/__mocks__/ProcessListContainer.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx
index 2d78724738..4c4c49a3a2 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/ProcessListContainer/tests/ProcessListContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import { ProcessListState } from '@kogito-apps/management-console-shared/dist/types';
@@ -48,7 +50,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/TaskFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/TaskFormContainer.tsx
index df433526e6..7e4e935a6b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/TaskFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/TaskFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/__mocks__/TaskFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/__mocks__/TaskFormContainer.tsx
index 7672f46d44..612ffeaa11 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/__mocks__/TaskFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/__mocks__/TaskFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedTaskFormContainer = ({
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/tests/TaskFormContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/tests/TaskFormContainer.test.tsx
index cc06b1db14..2aa46aee97 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/tests/TaskFormContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskFormContainer/tests/TaskFormContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import TaskFormContainer from '../TaskFormContainer';
@@ -70,7 +72,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/TaskInboxContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/TaskInboxContainer.tsx
index 1e0c4556de..aad184455a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/TaskInboxContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/TaskInboxContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx
index e86cd57534..52954329b6 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedTaskInboxContainer = (): React.ReactElement => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/tests/TaskInboxContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/tests/TaskInboxContainer.test.tsx
index e83038a47c..0befe5e74e 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/tests/TaskInboxContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/TaskInboxContainer/tests/TaskInboxContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import TaskInboxContainer from '../TaskInboxContainer';
@@ -39,7 +41,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/WorkflowFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/WorkflowFormContainer.tsx
index 1d81541a08..4a027afd01 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/WorkflowFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/WorkflowFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/__mocks__/WorkflowFormContainer.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/__mocks__/WorkflowFormContainer.tsx
index d2e0cafd31..4fc78b2497 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/__mocks__/WorkflowFormContainer.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/__mocks__/WorkflowFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedWorkflowFormContainer = ({
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/tests/WorkflowFormContainer.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/tests/WorkflowFormContainer.test.tsx
index 5d55aa7495..d335d4483a 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/tests/WorkflowFormContainer.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/containers/WorkflowFormContainer/tests/WorkflowFormContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render } from '@testing-library/react';
 import WorkflowFormContainer from '../WorkflowFormContainer';
@@ -65,7 +67,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContext.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContext.tsx
index a861d87462..d7c968916d 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContext.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContext.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 import { CustomLabels } from '../../api/CustomLabels';
@@ -33,8 +35,6 @@ export interface DevUIAppContext {
   omittedProcessTimelineEvents: string[];
   diagramPreviewSize?: DiagramPreviewSize;
   isWorkflow(): boolean;
-  isStunnerEnabled: boolean;
-  getIsStunnerEnabled(): boolean;
 }
 
 export interface UserChangeListener {
@@ -55,7 +55,6 @@ export type DevUIAppContextArgs = {
   customLabels?: CustomLabels;
   omittedProcessTimelineEvents: string[];
   diagramPreviewSize?: DiagramPreviewSize;
-  isStunnerEnabled: boolean;
 };
 
 export class DevUIAppContextImpl implements DevUIAppContext {
@@ -111,10 +110,6 @@ export class DevUIAppContextImpl implements DevUIAppContext {
     return this.args.customLabels?.singularProcessLabel == 'Workflow';
   }
 
-  getIsStunnerEnabled(): boolean {
-    return this.args.isStunnerEnabled;
-  }
-
   get isProcessEnabled(): boolean {
     return this.args.isProcessEnabled;
   }
@@ -123,10 +118,6 @@ export class DevUIAppContextImpl implements DevUIAppContext {
     return this.args.isTracingEnabled;
   }
 
-  get isStunnerEnabled(): boolean {
-    return this.args.isStunnerEnabled;
-  }
-
   get availablePages(): string[] {
     return this.args.availablePages;
   }
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContextProvider.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContextProvider.tsx
index 66055402d8..7994a9fcb4 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContextProvider.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/contexts/DevUIAppContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 import RuntimeToolsDevUIAppContext, {
@@ -32,7 +34,6 @@ interface IOwnProps {
   customLabels: CustomLabels;
   omittedProcessTimelineEvents: string[];
   diagramPreviewSize: DiagramPreviewSize;
-  isStunnerEnabled: boolean;
 }
 
 const DevUIAppContextProvider: React.FC<IOwnProps> = ({
@@ -45,7 +46,6 @@ const DevUIAppContextProvider: React.FC<IOwnProps> = ({
   customLabels,
   omittedProcessTimelineEvents,
   diagramPreviewSize,
-  isStunnerEnabled,
   children
 }) => {
   return (
@@ -60,8 +60,7 @@ const DevUIAppContextProvider: React.FC<IOwnProps> = ({
           availablePages,
           customLabels,
           omittedProcessTimelineEvents,
-          diagramPreviewSize,
-          isStunnerEnabled
+          diagramPreviewSize
         })
       }
     >
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/CloudEventFormPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/CloudEventFormPage.tsx
index 2d996b0ccf..21ec43127a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/CloudEventFormPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/CloudEventFormPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Card, CardBody } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/__mocks__/CloudEventPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/__mocks__/CloudEventPage.tsx
index 11f8a3f521..a196a82f87 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/__mocks__/CloudEventPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/__mocks__/CloudEventPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/tests/CloudEventFormPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/tests/CloudEventFormPage.test.tsx
index 898bc7f46c..8a9bae79c4 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/tests/CloudEventFormPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CloudEventFormPage/tests/CloudEventFormPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/CustomDashboardListPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/CustomDashboardListPage.tsx
index 157899024f..44e6ebb390 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/CustomDashboardListPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/CustomDashboardListPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/__mocks__/CustomDashboardListPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/__mocks__/CustomDashboardListPage.tsx
index f75a959e14..0d98d300ce 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/__mocks__/CustomDashboardListPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/__mocks__/CustomDashboardListPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/tests/CustomDashboardListPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/tests/CustomDashboardListPage.test.tsx
index 79a6ecebeb..faf338dfa3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/tests/CustomDashboardListPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardListPage/tests/CustomDashboardListPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import CustomDashboardListPage from '../CustomDashboardListPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/CustomDashboardViewPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/CustomDashboardViewPage.tsx
index a616c268f4..67d6d820eb 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/CustomDashboardViewPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/CustomDashboardViewPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { OUIAProps } from '@kogito-apps/ouia-tools/dist/utils/OuiaUtils';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/__mocks__/CustomDashboardViewPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/__mocks__/CustomDashboardViewPage.tsx
index 4eaa390e0e..e45f45f649 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/__mocks__/CustomDashboardViewPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/__mocks__/CustomDashboardViewPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/tests/CustomDashboardViewPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/tests/CustomDashboardViewPage.test.tsx
index a39678fd3e..5d3a4af1ed 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/tests/CustomDashboardViewPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/CustomDashboardViewPage/tests/CustomDashboardViewPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import CustomDashboardViewPage from '../CustomDashboardViewPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx
index 5222313457..2b202f1332 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/__mocks__/FormDetailsPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/__mocks__/FormDetailsPage.tsx
index caa0fa5916..cbc878f704 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/__mocks__/FormDetailsPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/__mocks__/FormDetailsPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/FormDetailsNotification.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/FormDetailsNotification.tsx
index 770009a71e..4660c5744c 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/FormDetailsNotification.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/FormDetailsNotification.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   Alert,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/__mocks__/FormDetailsNotification.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/__mocks__/FormDetailsNotification.tsx
index 116cc170f8..e97b248c7a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/__mocks__/FormDetailsNotification.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/__mocks__/FormDetailsNotification.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const FormDetailsNotificationMock = (): React.ReactElement => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/tests/FormDetailsNotification.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/tests/FormDetailsNotification.test.tsx
index a526bd739f..ec29bb087e 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/tests/FormDetailsNotification.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/components/FormDetailsNotification/tests/FormDetailsNotification.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import FormDetailsNotification, {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/tests/FormDetailsPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/tests/FormDetailsPage.test.tsx
index 6f357427ec..fbee3b87e4 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/tests/FormDetailsPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormDetailsPage/tests/FormDetailsPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import FormDetailsPage from '../FormDetailsPage';
@@ -46,7 +48,6 @@ jest.spyOn(DevUIAppContext, 'useDevUIAppContext').mockImplementation(
       devUIUrl: 'http://localhost:9000',
       openApiPath: 'mockedPath',
       isProcessEnabled: false,
-      isStunnerEnabled: false,
       isTracingEnabled: false,
       omittedProcessTimelineEvents: []
     })
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/FormsListPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/FormsListPage.tsx
index 5d36736497..9e4daa623e 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/FormsListPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/FormsListPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/__mocks__/FormsListPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/__mocks__/FormsListPage.tsx
index 64c699d02c..528c19e5d6 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/__mocks__/FormsListPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/__mocks__/FormsListPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/tests/FormsListPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/tests/FormsListPage.test.tsx
index a8bf13acf4..737a5d5be7 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/tests/FormsListPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/FormsListPage/tests/FormsListPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import FormsListPage from '../FormsListPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx
index c2cf45bd1b..e8cc5b176d 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/JobsManagementPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx
index bc525cc087..23867aaad1 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/__mocks__/JobsManagementPage.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedJobsManagementPage: React.FC = () => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx
index 26c3680c88..446a92a099 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/JobsManagementPage/tests/JobsManagementPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { render } from '@testing-library/react';
 import React from 'react';
 import JobsManagementPage from '../JobsManagementPage';
@@ -31,7 +33,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/MonitoringPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/MonitoringPage.tsx
index 8168f86017..a271c2e32b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/MonitoringPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/MonitoringPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { ReactText, useCallback, useEffect, useState } from 'react';
 import {
   Toolbar,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/tests/MonitoringPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/tests/MonitoringPage.test.tsx
index f680ffbbc3..4e624deeef 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/tests/MonitoringPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/MonitoringPage/tests/MonitoringPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import MonitoringPage from '../MonitoringPage';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
index 839e4371d5..4e14a21b21 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState, useEffect } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx
index e3c23351f0..496f26b325 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/__mocks__/ProcessDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedProcessDetailsPage: React.FC = () => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx
index 3851fc7807..7239372ac3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessDetailsPage/tests/ProcessDetailsPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import * as H from 'history';
 import { render } from '@testing-library/react';
@@ -172,7 +174,6 @@ describe('WebApp - ProcessDetailsPage tests', () => {
           width: 600,
           height: 600
         },
-        isStunnerEnabled: false,
         isWorkflow: jest.fn()
       };
     });
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx
index a80dff9fac..1127d2df58 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import { Card, CardBody } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/__mocks__/ProcessFormPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/__mocks__/ProcessFormPage.tsx
index 65327e6519..8c7f6d8764 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/__mocks__/ProcessFormPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/__mocks__/ProcessFormPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/InlineEdit.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/InlineEdit.tsx
index 03a13fe1b4..bac05fa617 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/InlineEdit.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/InlineEdit.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
 import { TextInput } from '@patternfly/react-core/dist/js/components/TextInput';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/__mocks__/InlineEdit.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/__mocks__/InlineEdit.tsx
index a5d0cf716f..a04dc5b01f 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/__mocks__/InlineEdit.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/__mocks__/InlineEdit.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/tests/InlineEdit.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/tests/InlineEdit.test.tsx
index 12bec0c68a..adc6f80322 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/tests/InlineEdit.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/components/InlineEdit/tests/InlineEdit.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import InlineEdit from '../InlineEdit';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/tests/ProcessFormPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/tests/ProcessFormPage.test.tsx
index 7d645d8865..1c6ede9cb6 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/tests/ProcessFormPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessFormPage/tests/ProcessFormPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import ProcessFormPage from '../ProcessFormPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx
index a188e17dfd..dbcd3b513f 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { ReactText, useEffect, useState } from 'react';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/__mocks__/ProcessesPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/__mocks__/ProcessesPage.tsx
index a8b04f7541..b9527d49ee 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/__mocks__/ProcessesPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/__mocks__/ProcessesPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/tests/ProcessesPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/tests/ProcessesPage.test.tsx
index bd337d1418..6fb64c1167 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/tests/ProcessesPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/ProcessesPage/tests/ProcessesPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import ProcessesPage from '../ProcessesPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
index 6095bea136..449a228a80 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx
index a5d0cf716f..a04dc5b01f 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx
index 376ac2a4f8..84bdb650e8 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import * as H from 'history';
 import { MemoryRouter } from 'react-router';
@@ -110,7 +112,6 @@ const appContextProps = {
   isProcessEnabled: false,
   isTracingEnabled: false,
   omittedProcessTimelineEvents: [],
-  isStunnerEnabled: false,
   availablePages: [],
   customLabels: {
     singularProcessLabel: 'test-singular',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx
index 66da0c2209..9c203bf31a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { Grid, GridItem } from '@patternfly/react-core/dist/js/layouts/Grid';
 import { Card } from '@patternfly/react-core/dist/js/components/Card';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx
index ac6f6e2dd2..a04dc5b01f 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/TaskInboxSwitchUser.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/TaskInboxSwitchUser.tsx
index cdc1d4b1fa..92555477d8 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/TaskInboxSwitchUser.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/TaskInboxSwitchUser.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useState } from 'react';
 import {
   Dropdown,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/tests/TaskInboxSwitchUser.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/tests/TaskInboxSwitchUser.test.tsx
index 8ef9f0a633..60ec1f0dd9 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/tests/TaskInboxSwitchUser.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/components/tests/TaskInboxSwitchUser.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import TaskInboxSwitchUser from '../TaskInboxSwitchUser';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx
index 19f3992bb9..57de85eda5 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import TaskInboxPage from '../TaskInboxPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/WorkflowFormPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/WorkflowFormPage.tsx
index e96da783de..15f67c97c7 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/WorkflowFormPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/WorkflowFormPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useRef, useState } from 'react';
 import { Card, CardBody } from '@patternfly/react-core/dist/js/components/Card';
 import { PageSection } from '@patternfly/react-core/dist/js/components/Page';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/__mocks__/WorkflowFormPage.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/__mocks__/WorkflowFormPage.tsx
index 30eb96af77..a196a82f87 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/__mocks__/WorkflowFormPage.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/__mocks__/WorkflowFormPage.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/tests/WorkflowFormPage.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/tests/WorkflowFormPage.test.tsx
index e2ac232126..51435b863a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/tests/WorkflowFormPage.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/WorkflowFormPage/tests/WorkflowFormPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import WorkflowFormPage from '../WorkflowFormPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/index.ts
index afc32097a5..ace076974d 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/pages/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as JobsManagementPage } from './JobsManagementPage/JobsManagementPage';
 export { default as ProcessesPage } from './ProcessesPage/ProcessesPage';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/styles.css b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/styles.css
index 6776fdac8d..fe5bb1b977 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/styles.css
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/components/styles.css
@@ -1,24 +1,26 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .Dev-ui__card-size,
 .Dev-ui__custom-dashboard-viewer > div {
-    height: 100%
+  height: 100%;
 }
 
 .DevUI-switchUser-dropdown-styling {
-    margin-left: 5em !important;
+  margin-left: 5em !important;
 }
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelope.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelope.tsx
index ec09d041fd..cbf4a1a13e 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelope.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { Envelope, EnvelopeApiFactory } from '@kie-tools-core/envelope';
 import {
   RuntimeToolsDevUIChannelApi,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeApiImpl.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeApiImpl.ts
index c8bb36eab2..ea376f3ec3 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeApiImpl.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import {
   Association,
@@ -78,8 +80,6 @@ export class RuntimeToolsDevUIEnvelopeApiImpl
       );
     this.view().setDiagramPreviewSize &&
       this.view().setDiagramPreviewSize(initArgs.diagramPreviewSize);
-    this.view().setIsStunnerEnabled &&
-      this.view().setIsStunnerEnabled(initArgs.isStunnerEnabled);
     // Ensure these are set last. This is a workaround to ensure views are corrected configured with other properties
     // from the DevUIAppContext before they are rendered. i.e. use of DevUIAppContext is not responsive to updates.
     this.view().setProcessEnabled(initArgs.isDataIndexAvailable);
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeContext.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeContext.ts
index ee4f64f06d..2357392d42 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeContext.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { RuntimeToolsDevUIChannelApi } from '../api/RuntimeToolsDevUIChannelApi';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeView.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeView.tsx
index 98d2706774..f3c8f387a2 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeView.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle } from 'react';
 import '@patternfly/patternfly/patternfly.css';
 import '@patternfly/react-core/dist/styles/base.css';
@@ -38,8 +40,6 @@ export const RuntimeToolsDevUIEnvelopeView =
       React.useState<string[]>([]);
     const [diagramPreviewSize, setDiagramPreviewSize] =
       React.useState<DiagramPreviewSize>();
-    const [isStunnerEnabled, setIsStunnerEnabled] =
-      React.useState<boolean>(false);
 
     useImperativeHandle(
       forwardingRef,
@@ -80,9 +80,6 @@ export const RuntimeToolsDevUIEnvelopeView =
           },
           setDiagramPreviewSize: (diagramPreviewSize) => {
             setDiagramPreviewSize(diagramPreviewSize);
-          },
-          setIsStunnerEnabled: (isStunnerEnabled) => {
-            setIsStunnerEnabled(isStunnerEnabled);
           }
         };
       },
@@ -104,7 +101,6 @@ export const RuntimeToolsDevUIEnvelopeView =
             customLabels={customLabels}
             omittedProcessTimelineEvents={omittedProcessTimelineEvents}
             diagramPreviewSize={diagramPreviewSize}
-            isStunnerEnabled={isStunnerEnabled}
           />
         )}
       </>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeViewApi.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeViewApi.ts
index 53eb44a179..346ece8efa 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeViewApi.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/RuntimeToolsDevUIEnvelopeViewApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { User } from '../api';
 import { CustomLabels } from '../api/CustomLabels';
 import { DiagramPreviewSize } from '@kogito-apps/process-details/dist/api';
@@ -33,5 +35,4 @@ export interface RuntimeToolsDevUIEnvelopeViewApi {
     omittedProcessTimelineEvents: string[]
   ) => void;
   setDiagramPreviewSize: (diagramPreviewSize?: DiagramPreviewSize) => void;
-  setIsStunnerEnabled: (isStunnerEnabled: boolean) => void;
 }
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/index.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/index.ts
index d6ae1d210b..5e2dfb4180 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/index.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './RuntimeToolsDevUIEnvelopeContext';
 export * from './RuntimeToolsDevUIEnvelopeViewApi';
 export * from './RuntimeToolsDevUIEnvelopeView';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeApiImpl.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeApiImpl.test.ts
index 9f284fbcf2..10afde10b1 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedRuntimeToolsDevUIEnvelopeViewApi
@@ -57,8 +59,7 @@ describe('JobsManagementEnvelopeApiImpl tests', () => {
         devUIUrl: '',
         openApiPath: '',
         isProcessEnabled: true,
-        isTracingEnabled: true,
-        isStunnerEnabled: false
+        isTracingEnabled: true
       }
     );
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeView.test.tsx b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeView.test.tsx
index b93e0faf18..6f970272de 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeView.test.tsx
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/RuntimeToolsDevUIEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { render, screen } from '@testing-library/react';
@@ -43,7 +45,6 @@ describe('RuntimeToolsDevUIEnvelopeView tests', () => {
         forwardRef.current.setOpenApiPath('/docs/openapi.json');
         forwardRef.current.setProcessEnabled(true);
         forwardRef.current.setTracingEnabled(true);
-        forwardRef.current.setIsStunnerEnabled(false);
         forwardRef.current.setAvailablePages([
           'Processes',
           'Monitoring',
@@ -89,7 +90,6 @@ describe('RuntimeToolsDevUIEnvelopeView tests', () => {
         forwardRef.current.setTrustyServiceUrl('http://localhost:8081');
         forwardRef.current.setUsers([]);
         forwardRef.current.navigateTo('/CustomDashboard');
-        forwardRef.current.setIsStunnerEnabled(false);
         forwardRef.current.setAvailablePages([
           'Processes',
           'Monitoring',
@@ -134,7 +134,6 @@ describe('RuntimeToolsDevUIEnvelopeView tests', () => {
         forwardRef.current.setTrustyServiceUrl('http://localhost:8081');
         forwardRef.current.setUsers([]);
         forwardRef.current.navigateTo('/CustomDashboard');
-        forwardRef.current.setIsStunnerEnabled(false);
         forwardRef.current.setAvailablePages([
           'Processes',
           'Monitoring',
@@ -180,7 +179,6 @@ describe('RuntimeToolsDevUIEnvelopeView tests', () => {
         forwardRef.current.setTrustyServiceUrl('http://localhost:8081');
         forwardRef.current.setUsers([]);
         forwardRef.current.navigateTo('/CustomDashboard');
-        forwardRef.current.setIsStunnerEnabled(false);
         forwardRef.current.setAvailablePages([
           'Processes',
           'Monitoring',
@@ -226,7 +224,6 @@ describe('RuntimeToolsDevUIEnvelopeView tests', () => {
         forwardRef.current.setTrustyServiceUrl('http://localhost:8081');
         forwardRef.current.setUsers([]);
         forwardRef.current.navigateTo('');
-        forwardRef.current.setIsStunnerEnabled(false);
         forwardRef.current.setAvailablePages([
           'Processes',
           'Monitoring',
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/mocks/Mocks.ts
index 96187dd1db..4a371f17e2 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ApiNotificationConsumers,
   MessageBusClientApi,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/global.d.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/global.d.ts
index a4e4fc3939..f6be0bf979 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/global.d.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/global.d.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 declare module '*.html';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/index.html b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/index.html
index 003a8f7856..8a98367495 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/index.html
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/index.html
@@ -1,19 +1,23 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
   <head>
@@ -25,6 +29,6 @@
   </head>
   <body class="pf-m-redhat-font">
     <noscript>Enabling JavaScript is required to run this app.</noscript>
-    <div id="envelope-app" style="height: 100%;"></div>
+    <div id="envelope-app" style="height: 100%"></div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowCombinedEditorEnvelopeApp.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowCombinedEditorEnvelopeApp.ts
index e0fb8e8ed4..eeecd82bde 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowCombinedEditorEnvelopeApp.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowCombinedEditorEnvelopeApp.ts
@@ -1,28 +1,30 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as EditorEnvelope from '@kie-tools-core/editor/dist/envelope';
 import { NoOpKeyboardShortcutsService } from '@kie-tools-core/keyboard-shortcuts/dist/envelope';
-import { ServerlessWorkflowCombinedEditorChannelApi } from '@kie-tools/serverless-workflow-combined-editor/dist/api';
-import { ServerlessWorkflowCombinedEditorEnvelopeApi } from '@kie-tools/serverless-workflow-combined-editor/dist/api/ServerlessWorkflowCombinedEditorEnvelopeApi';
 import {
   ServerlessWorkflowCombinedEditorApi,
-  ServerlessWorkflowCombinedEditorFactory
-} from '@kie-tools/serverless-workflow-combined-editor/dist/editor';
-import { ServerlessWorkflowCombinedEditorEnvelopeApiImpl } from '@kie-tools/serverless-workflow-combined-editor/dist/impl';
+  ServerlessWorkflowCombinedEditorChannelApi,
+  ServerlessWorkflowCombinedEditorEnvelopeApi
+} from '@kie-tools/serverless-workflow-combined-editor/dist/api';
+import { ServerlessWorkflowCombinedEditorFactory } from '@kie-tools/serverless-workflow-combined-editor/dist/editor';
+import { ServerlessWorkflowCombinedEditorEnvelopeApiImpl } from '@kie-tools/serverless-workflow-combined-editor/dist/envelope';
 
 EditorEnvelope.initCustom<
   ServerlessWorkflowCombinedEditorApi,
@@ -35,11 +37,12 @@ EditorEnvelope.initCustom<
       window.parent.postMessage(message, window.location.origin, _)
   },
   apiImplFactory: {
-    create: (args) =>
-      new ServerlessWorkflowCombinedEditorEnvelopeApiImpl(
+    create: (args) => {
+      return new ServerlessWorkflowCombinedEditorEnvelopeApiImpl(
         args,
         new ServerlessWorkflowCombinedEditorFactory()
-      )
+      );
+    }
   },
   keyboardShortcutsService: new NoOpKeyboardShortcutsService()
 });
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowDiagramEditorEnvelopeApp.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowDiagramEditorEnvelopeApp.ts
index 07e530aa80..784be63343 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowDiagramEditorEnvelopeApp.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowDiagramEditorEnvelopeApp.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as EditorEnvelope from '@kie-tools-core/editor/dist/envelope';
 import {
   ServerlessWorkflowDiagramEditorChannelApi,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowMermaidViewerEnvelopeApp.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowMermaidViewerEnvelopeApp.ts
deleted file mode 100644
index bda30e9fe4..0000000000
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowMermaidViewerEnvelopeApp.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { init } from '@kie-tools-core/editor/dist/envelope';
-import { NoOpKeyboardShortcutsService } from '@kie-tools-core/keyboard-shortcuts/dist/envelope';
-import { ServerlessWorkflowMermaidViewerFactory } from '@kie-tools/serverless-workflow-mermaid-viewer/dist/viewer';
-
-init({
-  container: document.getElementById('swf-mermaid-viewer-envelope-app')!,
-  bus: {
-    postMessage: (message, targetOrigin, _) =>
-      window.parent.postMessage(message, targetOrigin!, _)
-  },
-  editorFactory: new ServerlessWorkflowMermaidViewerFactory(),
-  keyboardShortcutsService: new NoOpKeyboardShortcutsService()
-});
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowTextEditorEnvelopeApp.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowTextEditorEnvelopeApp.ts
index 1411f857fe..b9fe4c79ff 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowTextEditorEnvelopeApp.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/ServerlessWorkflowTextEditorEnvelopeApp.ts
@@ -1,27 +1,46 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
-import { init } from '@kie-tools-core/editor/dist/envelope';
+import * as EditorEnvelope from '@kie-tools-core/editor/dist/envelope';
+import { initCustom } from '@kie-tools-core/editor/dist/envelope';
+import {
+  ServerlessWorkflowTextEditorApi,
+  ServerlessWorkflowTextEditorChannelApi,
+  ServerlessWorkflowTextEditorEnvelopeApi
+} from '@kie-tools/serverless-workflow-text-editor/dist/api';
 import { ServerlessWorkflowTextEditorFactory } from '@kie-tools/serverless-workflow-text-editor/dist/editor';
+import { ServerlessWorkflowTextEditorEnvelopeApiImpl } from '@kie-tools/serverless-workflow-text-editor/dist/envelope';
 
-init({
+EditorEnvelope.initCustom<
+  ServerlessWorkflowTextEditorApi,
+  ServerlessWorkflowTextEditorEnvelopeApi,
+  ServerlessWorkflowTextEditorChannelApi
+>({
   container: document.getElementById('swf-text-editor-envelope-app')!,
   bus: {
     postMessage: (message, targetOrigin, _) =>
-      window.parent.postMessage(message, targetOrigin!, _)
+      window.parent.postMessage(message, '*', _)
   },
-  editorFactory: new ServerlessWorkflowTextEditorFactory()
+  apiImplFactory: {
+    create: (args) =>
+      new ServerlessWorkflowTextEditorEnvelopeApiImpl(
+        args,
+        new ServerlessWorkflowTextEditorFactory()
+      )
+  }
 });
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/form-displayer.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/form-displayer.ts
index 7a211bada8..100727a8ff 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/form-displayer.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/resources/form-displayer.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { init } from '@kogito-apps/form-displayer';
 import { ContainerType } from '@kie-tools-core/envelope/dist/api';
 
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/EnvelopeApp.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/EnvelopeApp.ts
index b719dc7dcc..dae75d8e0e 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/EnvelopeApp.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/EnvelopeApp.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import { Envelope } from '@kie-tools-core/envelope';
 import {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/RuntimeToolsDevUIChannelApiImpl.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/RuntimeToolsDevUIChannelApiImpl.ts
index ef0bd57eee..2c48592553 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/RuntimeToolsDevUIChannelApiImpl.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/RuntimeToolsDevUIChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { RuntimeToolsDevUIChannelApi } from '../api';
 
 export class RuntimeToolsDevUIChannelApiImpl
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/standalone.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/standalone.ts
index 1abd60c669..03ca05205a 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/standalone.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/standalone/standalone.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import devUIEnvelopeIndex from '!!raw-loader!../../resources/iframe.html';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
@@ -43,7 +45,6 @@ export interface Consoles {
     customLabels?: CustomLabels;
     omittedProcessTimelineEvents?: string[];
     diagramPreviewSize?: DiagramPreviewSize;
-    isStunnerEnabled: boolean;
   }) => StandaloneDevUIApi;
 }
 
@@ -58,7 +59,6 @@ const createEnvelopeServer = (
   devUIUrl: string,
   openApiPath: string,
   customLabels: CustomLabels,
-  isStunnerEnabled: boolean,
   diagramPreviewSize?: DiagramPreviewSize,
   origin?: string,
   availablePages?: string[],
@@ -93,7 +93,6 @@ const createEnvelopeServer = (
           customLabels,
           availablePages,
           omittedProcessTimelineEvents,
-          isStunnerEnabled,
           diagramPreviewSize
         }
       );
@@ -138,7 +137,6 @@ export function open(args: {
   availablePages?: string[];
   customLabels?: CustomLabels;
   omittedProcessTimelineEvents?: string[];
-  isStunnerEnabled: boolean;
   diagramPreviewSize?: DiagramPreviewSize;
 }): StandaloneDevUIApi {
   const iframe = document.createElement('iframe');
@@ -162,7 +160,6 @@ export function open(args: {
       singularProcessLabel: 'Process',
       pluralProcessLabel: 'Processes'
     },
-    args.isStunnerEnabled,
     args.diagramPreviewSize,
     args.origin,
     args.availablePages,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/QueryUtils.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/QueryUtils.ts
index e1df554fdb..2c113a7db4 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/QueryUtils.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/QueryUtils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import _ from 'lodash';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 import { SortBy, QueryFilter } from '@kogito-apps/task-inbox';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/Utils.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/Utils.ts
index f246590d35..c04b542a0b 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/Utils.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/Utils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 import { ProcessDefinition } from '@kogito-apps/process-definition-list';
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/QueryUtils.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/QueryUtils.test.ts
index b4c6816703..ca737e0437 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/QueryUtils.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/QueryUtils.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { getOrderByObject, buildTaskInboxWhereArgument } from '../QueryUtils';
 
 describe('QueryUtils test', () => {
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/Utils.test.ts b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/Utils.test.ts
index 93c28a8f22..ef54272091 100644
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/Utils.test.ts
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/src/utils/tests/Utils.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import {
   createProcessDefinitionList,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.common.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.common.js
index ffccec5144..c082143d9c 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.common.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.common.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
@@ -16,8 +34,6 @@ module.exports = {
     'resources/form-displayer': './src/resources/form-displayer.ts',
     'resources/serverless-workflow-text-editor-envelope':
       './src/resources/ServerlessWorkflowTextEditorEnvelopeApp.ts',
-    'resources/serverless-workflow-mermaid-viewer-envelope':
-      './src/resources/ServerlessWorkflowMermaidViewerEnvelopeApp.ts',
     'resources/serverless-workflow-combined-editor-envelope':
       './src/resources/ServerlessWorkflowCombinedEditorEnvelopeApp.ts',
     'resources/serverless-workflow-diagram-editor-envelope':
@@ -25,7 +41,7 @@ module.exports = {
   },
   plugins: [
     new MonacoWebpackPlugin({
-      languages: ['typescript', 'json'],
+      languages: ['typescript', 'json', 'html'],
       customLanguages: [
         {
           label: 'yaml',
@@ -62,11 +78,43 @@ module.exports = {
     new FileManagerPlugin({
       events: {
         onEnd: {
-          mkdir: ['./dist/resources/webapp/'],
+          mkdir: [
+            './dist/resources/webapp',
+            './dist/webapp/',
+            './dist/webapp/fonts/'
+          ],
           copy: [
-            { source: './dist/*.js', destination: './dist/resources/webapp/' },
-            { source: './dist/*.map', destination: './dist/resources/webapp/' },
-            { source: './dist/fonts', destination: './dist/resources/webapp/' },
+            {
+              source: './dist/envelope.js',
+              destination: './dist/resources/webapp/'
+            },
+            {
+              source: './dist/envelope.js.map',
+              destination: './dist/resources/webapp/'
+            },
+            {
+              source: './dist/standalone.js',
+              destination: './dist/resources/webapp/'
+            },
+            {
+              source: './dist/standalone.js.map',
+              destination: './dist/resources/webapp/'
+            },
+            {
+              source: './dist/*.js',
+              destination: './dist/webapp/',
+              globOptions: {
+                ignore: ['./dist/envelope.js', './dist/standalone.js']
+              }
+            },
+            {
+              source: './dist/*.map',
+              destination: './dist/webapp/',
+              globOptions: {
+                ignore: ['./dist/envelope.js.map', './dist/standalone.js.map']
+              }
+            },
+            { source: './dist/fonts', destination: './dist/webapp/fonts/' },
             {
               source: './dist/monitoring-webapp',
               destination: './dist/resources/webapp/monitoring-webapp'
@@ -74,8 +122,13 @@ module.exports = {
             {
               source: './dist/custom-dashboard-view',
               destination: './dist/resources/webapp/custom-dashboard-view'
+            },
+            {
+              source: './dist/diagram',
+              destination: './dist/resources/diagram'
             }
-          ]
+          ],
+          delete: ['./dist/*.js*', './dist/fonts', './dist/standalone']
         }
       }
     }),
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.dev.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.dev.js
index 1fe67ede29..c60b9d0334 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.dev.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.dev.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
@@ -46,7 +64,11 @@ module.exports = merge(common, {
     rules: [
       {
         test: /\.(css|sass|scss)$/,
-        use: [require.resolve('style-loader'), require.resolve('css-loader'), require.resolve('sass-loader')]
+        use: [
+          require.resolve('style-loader'),
+          require.resolve('css-loader'),
+          require.resolve('sass-loader')
+        ]
       },
       {
         test: /\.css$/,
diff --git a/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.prod.js b/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.prod.js
index 65c14bc2b0..864033d5a5 100755
--- a/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.prod.js
+++ b/ui-packages/packages/runtime-tools-dev-ui-webapp/webpack.prod.js
@@ -1,8 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const HtmlWebpackPlugin = require("html-webpack-plugin");
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = merge(common, {
   mode: 'production',
diff --git a/ui-packages/packages/task-console-shared/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/task-console-shared/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/task-console-shared/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/task-console-shared/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/task-console-shared/config/Jest-config/fileMocks.js b/ui-packages/packages/task-console-shared/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/task-console-shared/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/task-console-shared/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/task-console-shared/config/Jest-config/global-setup.js b/ui-packages/packages/task-console-shared/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/task-console-shared/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/task-console-shared/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/task-console-shared/config/Jest-config/styleMocks.js b/ui-packages/packages/task-console-shared/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/task-console-shared/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/task-console-shared/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/task-console-shared/config/Jest-config/test-setup.js b/ui-packages/packages/task-console-shared/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/task-console-shared/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/task-console-shared/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/task-console-shared/config/Jest-config/test-shim.js b/ui-packages/packages/task-console-shared/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/task-console-shared/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/task-console-shared/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/task-console-shared/src/components/TaskState/TaskState.tsx b/ui-packages/packages/task-console-shared/src/components/TaskState/TaskState.tsx
index e6c4bde076..7d0797f56a 100644
--- a/ui-packages/packages/task-console-shared/src/components/TaskState/TaskState.tsx
+++ b/ui-packages/packages/task-console-shared/src/components/TaskState/TaskState.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 import { Label } from '@patternfly/react-core/dist/js/components/Label';
diff --git a/ui-packages/packages/task-console-shared/src/components/TaskState/__mocks__/TaskState.tsx b/ui-packages/packages/task-console-shared/src/components/TaskState/__mocks__/TaskState.tsx
index 7511c2052b..50f0aa8b5b 100644
--- a/ui-packages/packages/task-console-shared/src/components/TaskState/__mocks__/TaskState.tsx
+++ b/ui-packages/packages/task-console-shared/src/components/TaskState/__mocks__/TaskState.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedTaskState = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-shared/src/components/TaskState/tests/TaskState.test.tsx b/ui-packages/packages/task-console-shared/src/components/TaskState/tests/TaskState.test.tsx
index ce51e33186..532138b661 100644
--- a/ui-packages/packages/task-console-shared/src/components/TaskState/tests/TaskState.test.tsx
+++ b/ui-packages/packages/task-console-shared/src/components/TaskState/tests/TaskState.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { BanIcon } from '@patternfly/react-icons/dist/js/icons/ban-icon';
 import { CheckCircleIcon } from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
diff --git a/ui-packages/packages/task-console-shared/src/components/index.ts b/ui-packages/packages/task-console-shared/src/components/index.ts
index d2e1944324..e31f5c9bf7 100644
--- a/ui-packages/packages/task-console-shared/src/components/index.ts
+++ b/ui-packages/packages/task-console-shared/src/components/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as TaskState } from './TaskState/TaskState';
diff --git a/ui-packages/packages/task-console-shared/src/index.ts b/ui-packages/packages/task-console-shared/src/index.ts
index 1d4ba6fe63..72f98269f2 100644
--- a/ui-packages/packages/task-console-shared/src/index.ts
+++ b/ui-packages/packages/task-console-shared/src/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './components';
 export * from './types';
diff --git a/ui-packages/packages/task-console-shared/src/types/index.ts b/ui-packages/packages/task-console-shared/src/types/index.ts
index 580ec85cc7..9d53b92978 100644
--- a/ui-packages/packages/task-console-shared/src/types/index.ts
+++ b/ui-packages/packages/task-console-shared/src/types/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './types';
diff --git a/ui-packages/packages/task-console-shared/src/types/types.ts b/ui-packages/packages/task-console-shared/src/types/types.ts
index 9d8d2c5415..f8310e279f 100644
--- a/ui-packages/packages/task-console-shared/src/types/types.ts
+++ b/ui-packages/packages/task-console-shared/src/types/types.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export type UserTaskInstance = {
   id: string;
   description?: string;
diff --git a/ui-packages/packages/task-console-webapp/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/task-console-webapp/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/task-console-webapp/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/task-console-webapp/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/task-console-webapp/config/Jest-config/fileMocks.js b/ui-packages/packages/task-console-webapp/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/task-console-webapp/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/task-console-webapp/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/task-console-webapp/config/Jest-config/global-setup.js b/ui-packages/packages/task-console-webapp/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/task-console-webapp/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/task-console-webapp/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/task-console-webapp/config/Jest-config/styleMocks.js b/ui-packages/packages/task-console-webapp/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/task-console-webapp/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/task-console-webapp/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/task-console-webapp/config/Jest-config/test-setup.js b/ui-packages/packages/task-console-webapp/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/task-console-webapp/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/task-console-webapp/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/task-console-webapp/config/Jest-config/test-shim.js b/ui-packages/packages/task-console-webapp/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/task-console-webapp/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/task-console-webapp/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/task-console-webapp/config/declare.d.ts b/ui-packages/packages/task-console-webapp/config/declare.d.ts
index 0004da08d4..3cfbfeeca3 100644
--- a/ui-packages/packages/task-console-webapp/config/declare.d.ts
+++ b/ui-packages/packages/task-console-webapp/config/declare.d.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 declare module '*.svg' {
   const content: string;
   export default content;
diff --git a/ui-packages/packages/task-console-webapp/cypress/integration/spec.js b/ui-packages/packages/task-console-webapp/cypress/integration/spec.js
index 98de993874..2fdc77164c 100644
--- a/ui-packages/packages/task-console-webapp/cypress/integration/spec.js
+++ b/ui-packages/packages/task-console-webapp/cypress/integration/spec.js
@@ -1,22 +1,24 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /// <reference types="Cypress" />
-describe('Task Console First Test', function() {
-  it('Does not do much!', function() {
-    expect(true).to.equal(true)
-  })
-})
\ No newline at end of file
+describe('Task Console First Test', function () {
+  it('Does not do much!', function () {
+    expect(true).to.equal(true);
+  });
+});
diff --git a/ui-packages/packages/task-console-webapp/cypress/plugins/index.js b/ui-packages/packages/task-console-webapp/cypress/plugins/index.js
index 3b928f3c00..9e90a3aab2 100644
--- a/ui-packages/packages/task-console-webapp/cypress/plugins/index.js
+++ b/ui-packages/packages/task-console-webapp/cypress/plugins/index.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /// <reference types="cypress" />
 // ***********************************************************
 // This example plugins/index.js can be used to load plugins
@@ -34,4 +36,4 @@
 module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
-}
+};
diff --git a/ui-packages/packages/task-console-webapp/cypress/support/commands.js b/ui-packages/packages/task-console-webapp/cypress/support/commands.js
index 76822cc658..615773ee8b 100644
--- a/ui-packages/packages/task-console-webapp/cypress/support/commands.js
+++ b/ui-packages/packages/task-console-webapp/cypress/support/commands.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 // ***********************************************
 // This example commands.js shows you how to
 // create various custom commands and overwrite
diff --git a/ui-packages/packages/task-console-webapp/cypress/support/index.js b/ui-packages/packages/task-console-webapp/cypress/support/index.js
index 6804e6d9f6..4745a4e6d9 100644
--- a/ui-packages/packages/task-console-webapp/cypress/support/index.js
+++ b/ui-packages/packages/task-console-webapp/cypress/support/index.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 // ***********************************************************
 // This example support/index.js is processed and
 // loaded automatically before your test files.
@@ -30,7 +32,7 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import './commands'
+import './commands';
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
diff --git a/ui-packages/packages/task-console-webapp/package.json b/ui-packages/packages/task-console-webapp/package.json
index 34bf824988..2ebad31e77 100755
--- a/ui-packages/packages/task-console-webapp/package.json
+++ b/ui-packages/packages/task-console-webapp/package.json
@@ -29,8 +29,8 @@
     "cypress:open": "cypress open"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/consoles-common": "workspace:*",
     "@kogito-apps/form-displayer": "workspace:*",
diff --git a/ui-packages/packages/task-console-webapp/resources/form-displayer.html b/ui-packages/packages/task-console-webapp/resources/form-displayer.html
index f7c087b1a3..4e710445ec 100644
--- a/ui-packages/packages/task-console-webapp/resources/form-displayer.html
+++ b/ui-packages/packages/task-console-webapp/resources/form-displayer.html
@@ -1,44 +1,50 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
-  <!DOCTYPE html>
-  <html lang="en">
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<!DOCTYPE html>
+<html lang="en">
   <head>
-      <style>
-          html,
-          body,
-          div#envelope-app {
-              margin: 0;
-              border: 0;
-              padding: 0;
-              overflow: hidden;
-              height: 100%;
-              width: 100%;
-              font-family: "Open Sans", Helvetica, Arial, sans-serif;
-          }
-      </style>
-  
-      <title></title>
-      <meta charset="UTF-8" />
-      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <style>
+      html,
+      body,
+      div#envelope-app {
+        margin: 0;
+        border: 0;
+        padding: 0;
+        overflow: hidden;
+        height: 100%;
+        width: 100%;
+        font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+      }
+    </style>
+
+    <title></title>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
-  <body style="overflow-y: auto;">
-  <div id="displayer-app"></div>
-  <script> var exports = {}; </script>
-  <script src="./form-displayer.js"></script>
+  <body style="overflow-y: auto">
+    <div id="displayer-app"></div>
+    <script>
+      var exports = {};
+    </script>
+    <script src="./form-displayer.js"></script>
   </body>
-  </html>  
\ No newline at end of file
+</html>
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/controllers.js b/ui-packages/packages/task-console-webapp/server/MockData/controllers.js
index 62c2d2a8f3..ce4ceb6a59 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/controllers.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/controllers.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 const fs = require('fs');
 const _ = require('lodash');
 const graphQL = require('./graphql');
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/forms/ApplyForVisa.js b/ui-packages/packages/task-console-webapp/server/MockData/forms/ApplyForVisa.js
index a17339e249..d96c654d42 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/forms/ApplyForVisa.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/forms/ApplyForVisa.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = ApplyForVisaForm = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
   type: 'object',
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravel.js b/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravel.js
index e1e1f3881f..08917b8a22 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravel.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravel.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = ConfirmTravelForm = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
   type: 'object',
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravelDraft7.js b/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravelDraft7.js
index fc7248a54c..7cb1219bef 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravelDraft7.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/forms/ConfirmTravelDraft7.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = ConfirmTravelFormDraft7 = {
   $schema: 'http://json-schema.org/draft-07/schema#',
   type: 'object',
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/forms/EmptyForm.js b/ui-packages/packages/task-console-webapp/server/MockData/forms/EmptyForm.js
index 37df5618b9..80c0c6357b 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/forms/EmptyForm.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/forms/EmptyForm.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = ConfirmTravelForm = {
   $schema: 'https://json-schema.org/draft/2019-09/schema',
   type: 'object',
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/graphql.js b/ui-packages/packages/task-console-webapp/server/MockData/graphql.js
index f0c69cc748..59ac436f97 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/graphql.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/graphql.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = data = {
   UserTaskInstances: [
     {
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/rest.js b/ui-packages/packages/task-console-webapp/server/MockData/rest.js
index 44fbd75877..fec1f3e662 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/rest.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/rest.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = restData = {
   process: [
     {
diff --git a/ui-packages/packages/task-console-webapp/server/MockData/types.js b/ui-packages/packages/task-console-webapp/server/MockData/types.js
index 5a7f2c5b8b..dd153acfab 100644
--- a/ui-packages/packages/task-console-webapp/server/MockData/types.js
+++ b/ui-packages/packages/task-console-webapp/server/MockData/types.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 const { gql } = require('apollo-server-express');
 module.exports = typeDefs = gql`
   scalar DateTime
diff --git a/ui-packages/packages/task-console-webapp/server/app.js b/ui-packages/packages/task-console-webapp/server/app.js
index fea53c9f06..a87ce7a13c 100644
--- a/ui-packages/packages/task-console-webapp/server/app.js
+++ b/ui-packages/packages/task-console-webapp/server/app.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 const server = require('./server');
 
 server.listen();
diff --git a/ui-packages/packages/task-console-webapp/server/config/index.js b/ui-packages/packages/task-console-webapp/server/config/index.js
index 9a6c3e59d9..5fd12d5369 100644
--- a/ui-packages/packages/task-console-webapp/server/config/index.js
+++ b/ui-packages/packages/task-console-webapp/server/config/index.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 const commonConfig = {
   env: process.env.NODE_ENV || 'development',
   port: parseInt(process.env.PORT, 10) || 4000,
diff --git a/ui-packages/packages/task-console-webapp/server/server.js b/ui-packages/packages/task-console-webapp/server/server.js
index 29e44143fd..2626573e71 100644
--- a/ui-packages/packages/task-console-webapp/server/server.js
+++ b/ui-packages/packages/task-console-webapp/server/server.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 // HTTP SERVER
 const express = require('express');
 var cors = require('cors');
diff --git a/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContext.tsx b/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContext.tsx
index bdae5a6fad..92c0c2300e 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContext.tsx
+++ b/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContext.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { TaskFormGatewayApi } from './TaskFormGatewayApi';
 
diff --git a/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContextProvider.tsx b/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContextProvider.tsx
index efe7a0e7c9..6cb06dc870 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContextProvider.tsx
+++ b/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { useKogitoAppContext } from '@kogito-apps/consoles-common/dist/environment/context';
 import { TaskFormGatewayApiImpl } from './TaskFormGatewayApi';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormGatewayApi.ts b/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormGatewayApi.ts
index 9c8e02a815..70eb261e4d 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormGatewayApi.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/forms/TaskFormGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import axios from 'axios';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/forms/index.ts b/ui-packages/packages/task-console-webapp/src/channel/forms/index.ts
index 7617c54c5c..60f1a7e5c3 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/forms/index.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/forms/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { TaskFormGatewayApi } from './TaskFormGatewayApi';
 export * from './TaskFormContext';
 export { default as TaskFormContextProvider } from './TaskFormContextProvider';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/forms/tests/TaskFormGatewayApi.test.ts b/ui-packages/packages/task-console-webapp/src/channel/forms/tests/TaskFormGatewayApi.test.ts
index a1b800dc57..ca753a9a6b 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/forms/tests/TaskFormGatewayApi.test.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/forms/tests/TaskFormGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import axios from 'axios';
 import _ from 'lodash';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/forms/tests/mocks/Mocks.ts b/ui-packages/packages/task-console-webapp/src/channel/forms/tests/mocks/Mocks.ts
index 65a88939a7..2d52a84705 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/forms/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/forms/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export const ApplyForVisaForm = {
   type: 'object',
   properties: {
diff --git a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContext.tsx b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContext.tsx
index a4de852983..fa0afe11d8 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContext.tsx
+++ b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContext.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useContext } from 'react';
 import { TaskInboxGatewayApi } from './TaskInboxGatewayApi';
 
diff --git a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContextProvider.tsx b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContextProvider.tsx
index 0e7bc29686..bcee00f647 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContextProvider.tsx
+++ b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxContextProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ApolloClient } from 'apollo-client';
 import { useKogitoAppContext } from '@kogito-apps/consoles-common/dist/environment/context';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxGatewayApi.ts b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxGatewayApi.ts
index 629559a565..3aa2b49a43 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxGatewayApi.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxGatewayApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { QueryFilter, SortBy, TaskInboxState } from '@kogito-apps/task-inbox';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import { TaskInboxQueries } from './TaskInboxQueries';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxQueries.ts b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxQueries.ts
index d0348ab3e0..b91346fcae 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxQueries.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/inbox/TaskInboxQueries.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { ApolloClient } from 'apollo-client';
 import { SortBy, QueryFilter } from '@kogito-apps/task-inbox';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/inbox/index.ts b/ui-packages/packages/task-console-webapp/src/channel/inbox/index.ts
index 46c35c76a1..ded3e2ca54 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/inbox/index.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/inbox/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { TaskInboxGatewayApi } from './TaskInboxGatewayApi';
 export * from './TaskInboxContext';
 export { default as TaskInboxContextProvider } from './TaskInboxContextProvider';
diff --git a/ui-packages/packages/task-console-webapp/src/channel/inbox/tests/TaskInboxGatewayApi.test.ts b/ui-packages/packages/task-console-webapp/src/channel/inbox/tests/TaskInboxGatewayApi.test.ts
index 299c0ae6cc..50a66d55da 100644
--- a/ui-packages/packages/task-console-webapp/src/channel/inbox/tests/TaskInboxGatewayApi.test.ts
+++ b/ui-packages/packages/task-console-webapp/src/channel/inbox/tests/TaskInboxGatewayApi.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { TaskInboxQueries } from '../TaskInboxQueries';
 import { QueryFilter, SortBy, TaskInboxState } from '@kogito-apps/task-inbox';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/TaskConsole.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/TaskConsole.tsx
index 67a479c8a5..c68183d081 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/TaskConsole.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/TaskConsole.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import { ApolloClient } from 'apollo-client';
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/tests/TaskConsole.test.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/tests/TaskConsole.test.tsx
index 944013d670..e24c83dd95 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/tests/TaskConsole.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsole/tests/TaskConsole.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import TaskConsole from '../TaskConsole';
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/TaskConsoleNav.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/TaskConsoleNav.tsx
index e2d93c65e1..031015f355 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/TaskConsoleNav.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/TaskConsoleNav.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   Nav,
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/__mocks__/TaskConsoleNav.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/__mocks__/TaskConsoleNav.tsx
index ac6f6e2dd2..a04dc5b01f 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/__mocks__/TaskConsoleNav.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/__mocks__/TaskConsoleNav.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/tests/TaskConsoleNav.test.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/tests/TaskConsoleNav.test.tsx
index 6ecec98405..071afa1932 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/tests/TaskConsoleNav.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleNav/tests/TaskConsoleNav.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import TaskConsoleNav from '../TaskConsoleNav';
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/TaskConsoleRoutes.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/TaskConsoleRoutes.tsx
index e71d622129..c6835e3553 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/TaskConsoleRoutes.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/TaskConsoleRoutes.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import { TaskDetailsPage, TaskInboxPage } from '../../pages';
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/__mocks__/TaskConsoleRoutes.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/__mocks__/TaskConsoleRoutes.tsx
index ac6f6e2dd2..a04dc5b01f 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/__mocks__/TaskConsoleRoutes.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/__mocks__/TaskConsoleRoutes.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/tests/TaskConsoleRoutes.test.tsx b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/tests/TaskConsoleRoutes.test.tsx
index 5af52c6222..e6de245a6e 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/tests/TaskConsoleRoutes.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/console/TaskConsoleRoutes/tests/TaskConsoleRoutes.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import TaskConsoleRoutes from '../TaskConsoleRoutes';
diff --git a/ui-packages/packages/task-console-webapp/src/components/console/index.ts b/ui-packages/packages/task-console-webapp/src/components/console/index.ts
index cfdf9b117c..5ab8642596 100644
--- a/ui-packages/packages/task-console-webapp/src/components/console/index.ts
+++ b/ui-packages/packages/task-console-webapp/src/components/console/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as TaskConsole } from './TaskConsole/TaskConsole';
 export { default as TaskConsoleNav } from './TaskConsoleNav/TaskConsoleNav';
 export { default as TaskConsoleRoutes } from './TaskConsoleRoutes/TaskConsoleRoutes';
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
index 92efdc2e80..e91b07193f 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import { Link, RouteComponentProps } from 'react-router-dom';
 import {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx
index a5d0cf716f..a04dc5b01f 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/__mocks__/TaskDetailsPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/FormNotification.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/FormNotification.tsx
index 001ff37bda..b1007ef03d 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/FormNotification.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/FormNotification.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   Alert,
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/__mocks__/FormNotification.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/__mocks__/FormNotification.tsx
index d004fe2c93..dafdad4f97 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/__mocks__/FormNotification.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/__mocks__/FormNotification.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedFormNotification = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/tests/FormNotification.test.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/tests/FormNotification.test.tsx
index 561a760ea0..8df1c173ae 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/tests/FormNotification.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/FormNotification/tests/FormNotification.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import FormNotification, { Notification } from '../FormNotification';
 import {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/TaskFormContainer.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/TaskFormContainer.tsx
index 9523983f1c..2d91617109 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/TaskFormContainer.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/TaskFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/__mocks__/TaskFormContainer.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/__mocks__/TaskFormContainer.tsx
index 8e22cc8d4a..64a3decf48 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/__mocks__/TaskFormContainer.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/__mocks__/TaskFormContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedTaskFormContainer = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/tests/TaskFormContainer.test.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/tests/TaskFormContainer.test.tsx
index 9d18440b57..1ff5ddafc4 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/tests/TaskFormContainer.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/components/TaskFormContainer/tests/TaskFormContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import TaskFormContainer from '../TaskFormContainer';
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx
index 5080684c04..4f93758de2 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskDetailsPage/tests/TaskDetailsPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import * as H from 'history';
 import { MemoryRouter } from 'react-router';
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx
index 6f2795b153..25c279f9e1 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/TaskInboxPage.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { Card, Grid, GridItem, PageSection } from '@patternfly/react-core';
 import {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx
index ac6f6e2dd2..a04dc5b01f 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/__mocks__/TaskInboxPage.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedComponent = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/TaskInboxContainer.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/TaskInboxContainer.tsx
index c5a5f1d7cf..2106cfd6fc 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/TaskInboxContainer.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/TaskInboxContainer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx
index e86cd57534..52954329b6 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/__mocks__/TaskInboxContainer.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 
 const MockedTaskInboxContainer = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/tests/TaskInboxContainer.test.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/tests/TaskInboxContainer.test.tsx
index 375447ad92..4502ad6697 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/tests/TaskInboxContainer.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/container/TaskInboxContainer/tests/TaskInboxContainer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import { DefaultUser } from '@kogito-apps/consoles-common/dist/environment/auth';
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx
index ba981f6452..46324d2853 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/TaskInboxPage/tests/TaskInboxPage.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import TaskInboxPage from '../TaskInboxPage';
diff --git a/ui-packages/packages/task-console-webapp/src/components/pages/index.ts b/ui-packages/packages/task-console-webapp/src/components/pages/index.ts
index 802317a66a..3d0ef0bdfb 100644
--- a/ui-packages/packages/task-console-webapp/src/components/pages/index.ts
+++ b/ui-packages/packages/task-console-webapp/src/components/pages/index.ts
@@ -1,18 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export { default as TaskInboxPage } from './TaskInboxPage/TaskInboxPage';
 export { default as TaskDetailsPage } from './TaskDetailsPage/TaskDetailsPage';
diff --git a/ui-packages/packages/task-console-webapp/src/components/styles.css b/ui-packages/packages/task-console-webapp/src/components/styles.css
index 879005d5a4..4d205ff2d3 100644
--- a/ui-packages/packages/task-console-webapp/src/components/styles.css
+++ b/ui-packages/packages/task-console-webapp/src/components/styles.css
@@ -1,23 +1,25 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-task-console__full-size {
-    height: 100%
+  height: 100%;
 }
 
 .kogito-task-console__task-details-page {
-    margin-top: 21px;
+  margin-top: 21px;
 }
diff --git a/ui-packages/packages/task-console-webapp/src/context/TaskConsoleContext/TaskConsoleContextsProvider.tsx b/ui-packages/packages/task-console-webapp/src/context/TaskConsoleContext/TaskConsoleContextsProvider.tsx
index f527d5aa86..a077eb5643 100644
--- a/ui-packages/packages/task-console-webapp/src/context/TaskConsoleContext/TaskConsoleContextsProvider.tsx
+++ b/ui-packages/packages/task-console-webapp/src/context/TaskConsoleContext/TaskConsoleContextsProvider.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ApolloClient } from 'apollo-client';
 import { TaskInboxContextProvider } from '../../channel/inbox';
diff --git a/ui-packages/packages/task-console-webapp/src/index.html b/ui-packages/packages/task-console-webapp/src/index.html
index ebc6ceb403..6394f49c13 100755
--- a/ui-packages/packages/task-console-webapp/src/index.html
+++ b/ui-packages/packages/task-console-webapp/src/index.html
@@ -1,19 +1,23 @@
 <!--
-  ~ Copyright 2021 Red Hat, Inc. and/or its affiliates.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
   <head>
diff --git a/ui-packages/packages/task-console-webapp/src/index.tsx b/ui-packages/packages/task-console-webapp/src/index.tsx
index 02703a461f..c264c3059e 100755
--- a/ui-packages/packages/task-console-webapp/src/index.tsx
+++ b/ui-packages/packages/task-console-webapp/src/index.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ApolloClient from 'apollo-client';
diff --git a/ui-packages/packages/task-console-webapp/src/resources/form-displayer.ts b/ui-packages/packages/task-console-webapp/src/resources/form-displayer.ts
index 405f2813e6..c6f1aa7d19 100644
--- a/ui-packages/packages/task-console-webapp/src/resources/form-displayer.ts
+++ b/ui-packages/packages/task-console-webapp/src/resources/form-displayer.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { init } from '@kogito-apps/form-displayer';
 import { EnvelopeBusMessage } from '@kie-tools-core/envelope-bus/dist/api';
 import { ContainerType } from '@kie-tools-core/envelope/dist/api';
diff --git a/ui-packages/packages/task-console-webapp/src/utils/QueryUtils.ts b/ui-packages/packages/task-console-webapp/src/utils/QueryUtils.ts
index 223e1447b6..85a0a17cc6 100644
--- a/ui-packages/packages/task-console-webapp/src/utils/QueryUtils.ts
+++ b/ui-packages/packages/task-console-webapp/src/utils/QueryUtils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import _ from 'lodash';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 import { SortBy, QueryFilter } from '@kogito-apps/task-inbox';
diff --git a/ui-packages/packages/task-console-webapp/src/utils/Utils.ts b/ui-packages/packages/task-console-webapp/src/utils/Utils.ts
index 39a443bb3c..94d3d4739b 100644
--- a/ui-packages/packages/task-console-webapp/src/utils/Utils.ts
+++ b/ui-packages/packages/task-console-webapp/src/utils/Utils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { GraphQL } from '@kogito-apps/consoles-common/dist/graphql';
 import { User } from '@kogito-apps/consoles-common/dist/environment/auth';
 
diff --git a/ui-packages/packages/task-console-webapp/webpack.common.js b/ui-packages/packages/task-console-webapp/webpack.common.js
index 5bd87a599a..9d74dcfb98 100755
--- a/ui-packages/packages/task-console-webapp/webpack.common.js
+++ b/ui-packages/packages/task-console-webapp/webpack.common.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
@@ -73,7 +91,7 @@ module.exports = {
         }
       },
       {
-        test: /\.(jpg|jpeg|png|gif)$/i,  
+        test: /\.(jpg|jpeg|png|gif)$/i,
         use: [
           {
             loader: 'url-loader',
diff --git a/ui-packages/packages/task-console-webapp/webpack.dev.js b/ui-packages/packages/task-console-webapp/webpack.dev.js
index f9713b915a..8410cb241b 100755
--- a/ui-packages/packages/task-console-webapp/webpack.dev.js
+++ b/ui-packages/packages/task-console-webapp/webpack.dev.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 const path = require('path');
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
@@ -23,7 +25,8 @@ const HOST = process.env.HOST || 'localhost';
 const PORT = process.env.PORT || '9000';
 
 module.exports = function (env) {
-  const dataIndexURL = env?.KOGITO_DATAINDEX_HTTP_URL ?? 'http://localhost:4000/graphql';
+  const dataIndexURL =
+    env?.KOGITO_DATAINDEX_HTTP_URL ?? 'http://localhost:4000/graphql';
   return merge(common, {
     mode: 'development',
     devtool: 'source-map',
@@ -43,12 +46,14 @@ module.exports = function (env) {
           errors: true
         },
         progress: true
-      },
+      }
     },
-    plugins: [new webpack.EnvironmentPlugin({
-      KOGITO_ENV_MODE: 'DEV',
-      KOGITO_DATAINDEX_HTTP_URL: dataIndexURL
-    })],
+    plugins: [
+      new webpack.EnvironmentPlugin({
+        KOGITO_ENV_MODE: 'DEV',
+        KOGITO_DATAINDEX_HTTP_URL: dataIndexURL
+      })
+    ],
     module: {
       rules: [
         {
@@ -59,10 +64,7 @@ module.exports = function (env) {
     },
     resolve: {
       extensions: ['.tsx', '.ts', '.js', '.jsx'],
-      modules: [
-        path.resolve('node_modules'),
-        path.resolve(__dirname, 'src')
-      ]
+      modules: [path.resolve('node_modules'), path.resolve(__dirname, 'src')]
     }
-  })
-}
+  });
+};
diff --git a/ui-packages/packages/task-console-webapp/webpack.prod.js b/ui-packages/packages/task-console-webapp/webpack.prod.js
index d206ae3088..7838c41e15 100755
--- a/ui-packages/packages/task-console-webapp/webpack.prod.js
+++ b/ui-packages/packages/task-console-webapp/webpack.prod.js
@@ -1,25 +1,27 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 const path = require('path');
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
 
 module.exports = merge(common, {
@@ -36,7 +38,7 @@ module.exports = merge(common, {
     new webpack.EnvironmentPlugin({
       KOGITO_ENV_MODE: 'PROD'
     }),
-    new CopyPlugin({ patterns: [{ from: "./resources", to: "./resources" }]}),
+    new CopyPlugin({ patterns: [{ from: './resources', to: './resources' }] })
   ],
   module: {
     rules: [
diff --git a/ui-packages/packages/task-details/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/task-details/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/task-details/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/task-details/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/task-details/config/Jest-config/fileMocks.js b/ui-packages/packages/task-details/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/task-details/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/task-details/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/task-details/config/Jest-config/global-setup.js b/ui-packages/packages/task-details/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/task-details/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/task-details/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/task-details/config/Jest-config/styleMocks.js b/ui-packages/packages/task-details/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/task-details/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/task-details/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/task-details/config/Jest-config/test-setup.js b/ui-packages/packages/task-details/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/task-details/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/task-details/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/task-details/config/Jest-config/test-shim.js b/ui-packages/packages/task-details/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/task-details/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/task-details/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/task-details/package.json b/ui-packages/packages/task-details/package.json
index 968f82569e..cf3ce21198 100644
--- a/ui-packages/packages/task-details/package.json
+++ b/ui-packages/packages/task-details/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/task-console-shared": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
diff --git a/ui-packages/packages/task-details/src/api/TaskDetailsApi.ts b/ui-packages/packages/task-details/src/api/TaskDetailsApi.ts
index 4f734d0e16..bdb2b71265 100644
--- a/ui-packages/packages/task-details/src/api/TaskDetailsApi.ts
+++ b/ui-packages/packages/task-details/src/api/TaskDetailsApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface TaskDetailsApi {}
diff --git a/ui-packages/packages/task-details/src/api/TaskDetailsChannelApi.ts b/ui-packages/packages/task-details/src/api/TaskDetailsChannelApi.ts
index a44f63df6b..fe0c666d08 100644
--- a/ui-packages/packages/task-details/src/api/TaskDetailsChannelApi.ts
+++ b/ui-packages/packages/task-details/src/api/TaskDetailsChannelApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface TaskDetailsChannelApi {}
diff --git a/ui-packages/packages/task-details/src/api/TaskDetailsEnvelopeApi.ts b/ui-packages/packages/task-details/src/api/TaskDetailsEnvelopeApi.ts
index 1cc74cf8ee..03f63f25e9 100644
--- a/ui-packages/packages/task-details/src/api/TaskDetailsEnvelopeApi.ts
+++ b/ui-packages/packages/task-details/src/api/TaskDetailsEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 
 export interface TaskDetailsEnvelopeApi {
diff --git a/ui-packages/packages/task-details/src/api/index.ts b/ui-packages/packages/task-details/src/api/index.ts
index 87e49702a5..dd30c6ea70 100644
--- a/ui-packages/packages/task-details/src/api/index.ts
+++ b/ui-packages/packages/task-details/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './TaskDetailsApi';
 export * from './TaskDetailsChannelApi';
 export * from './TaskDetailsEnvelopeApi';
diff --git a/ui-packages/packages/task-details/src/embedded/EmbeddedTaskDetails.tsx b/ui-packages/packages/task-details/src/embedded/EmbeddedTaskDetails.tsx
index b4262306a5..67150d42fe 100644
--- a/ui-packages/packages/task-details/src/embedded/EmbeddedTaskDetails.tsx
+++ b/ui-packages/packages/task-details/src/embedded/EmbeddedTaskDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import {
   TaskDetailsApi,
diff --git a/ui-packages/packages/task-details/src/embedded/__mocks__/EmbeddedTaskDetails.tsx b/ui-packages/packages/task-details/src/embedded/__mocks__/EmbeddedTaskDetails.tsx
index 3958dbfb77..2c620556b7 100644
--- a/ui-packages/packages/task-details/src/embedded/__mocks__/EmbeddedTaskDetails.tsx
+++ b/ui-packages/packages/task-details/src/embedded/__mocks__/EmbeddedTaskDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockEmbeddedTaskDetails = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-details/src/embedded/index.ts b/ui-packages/packages/task-details/src/embedded/index.ts
index 5c58702892..7c2f2bfc7b 100644
--- a/ui-packages/packages/task-details/src/embedded/index.ts
+++ b/ui-packages/packages/task-details/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedTaskDetails';
diff --git a/ui-packages/packages/task-details/src/embedded/tests/EmbeddedTaskDetails.test.tsx b/ui-packages/packages/task-details/src/embedded/tests/EmbeddedTaskDetails.test.tsx
index 44b826e1ff..cd5e56725b 100644
--- a/ui-packages/packages/task-details/src/embedded/tests/EmbeddedTaskDetails.test.tsx
+++ b/ui-packages/packages/task-details/src/embedded/tests/EmbeddedTaskDetails.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { mount } from 'enzyme';
 import React from 'react';
 import { EmbeddedTaskDetails } from '../EmbeddedTaskDetails';
diff --git a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelope.tsx b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelope.tsx
index c30422bc92..3a491353b2 100644
--- a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelope.tsx
+++ b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeApiImpl.ts b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeApiImpl.ts
index 65c5b3a690..758bc9fbc9 100644
--- a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeApiImpl.ts
+++ b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import {
   Association,
diff --git a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeContext.ts b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeContext.ts
index b638ad37c9..621c47adb1 100644
--- a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeContext.ts
+++ b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeContext.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface TaskDetailsEnvelopeContext {}
diff --git a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeView.tsx b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeView.tsx
index b42864ec96..0b77114e20 100644
--- a/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeView.tsx
+++ b/ui-packages/packages/task-details/src/envelope/TaskDetailsEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import { useImperativeHandle, useState } from 'react';
 
diff --git a/ui-packages/packages/task-details/src/envelope/component/TaskDetails.tsx b/ui-packages/packages/task-details/src/envelope/component/TaskDetails.tsx
index 68401ee77a..a680f3fe92 100755
--- a/ui-packages/packages/task-details/src/envelope/component/TaskDetails.tsx
+++ b/ui-packages/packages/task-details/src/envelope/component/TaskDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import { isEmpty } from 'lodash';
 import Moment from 'react-moment';
diff --git a/ui-packages/packages/task-details/src/envelope/component/__mocks__/TaskDetails.tsx b/ui-packages/packages/task-details/src/envelope/component/__mocks__/TaskDetails.tsx
index 62b9b98aaf..2ec8519dd4 100644
--- a/ui-packages/packages/task-details/src/envelope/component/__mocks__/TaskDetails.tsx
+++ b/ui-packages/packages/task-details/src/envelope/component/__mocks__/TaskDetails.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockTaskDetails = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-details/src/envelope/component/tests/TaskDetails.test.tsx b/ui-packages/packages/task-details/src/envelope/component/tests/TaskDetails.test.tsx
index d405764883..5cc0761035 100644
--- a/ui-packages/packages/task-details/src/envelope/component/tests/TaskDetails.test.tsx
+++ b/ui-packages/packages/task-details/src/envelope/component/tests/TaskDetails.test.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
diff --git a/ui-packages/packages/task-details/src/envelope/index.ts b/ui-packages/packages/task-details/src/envelope/index.ts
index 3aaf6eb778..5f720ba312 100644
--- a/ui-packages/packages/task-details/src/envelope/index.ts
+++ b/ui-packages/packages/task-details/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './TaskDetailsEnvelope';
diff --git a/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeApiImpl.test.ts b/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeApiImpl.test.ts
index b847c01001..10e7b8517c 100644
--- a/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { TaskDetailsChannelApi, TaskDetailsEnvelopeApi } from '../../api';
 
 import { TaskDetailsEnvelopeViewApi } from '../TaskDetailsEnvelopeView';
diff --git a/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeView.test.tsx b/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeView.test.tsx
index 894f7cf5c4..951e90bc5d 100644
--- a/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeView.test.tsx
+++ b/ui-packages/packages/task-details/src/envelope/tests/TaskDetailsEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/task-details/src/envelope/tests/utils/Mocks.tsx b/ui-packages/packages/task-details/src/envelope/tests/utils/Mocks.tsx
index 3934a03694..d035d485ca 100644
--- a/ui-packages/packages/task-details/src/envelope/tests/utils/Mocks.tsx
+++ b/ui-packages/packages/task-details/src/envelope/tests/utils/Mocks.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { TaskDetailsChannelApi, TaskDetailsEnvelopeApi } from '../../../api';
 import { TaskDetailsEnvelopeViewApi } from '../../TaskDetailsEnvelopeView';
 import { MessageBusServer } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/task-details/src/index.ts b/ui-packages/packages/task-details/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/task-details/src/index.ts
+++ b/ui-packages/packages/task-details/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/task-form/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/task-form/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/task-form/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/task-form/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/task-form/config/Jest-config/fileMocks.js b/ui-packages/packages/task-form/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/task-form/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/task-form/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/task-form/config/Jest-config/global-setup.js b/ui-packages/packages/task-form/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/task-form/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/task-form/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/task-form/config/Jest-config/styleMocks.js b/ui-packages/packages/task-form/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/task-form/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/task-form/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/task-form/config/Jest-config/test-setup.js b/ui-packages/packages/task-form/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/task-form/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/task-form/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/task-form/config/Jest-config/test-shim.js b/ui-packages/packages/task-form/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/task-form/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/task-form/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/task-form/package.json b/ui-packages/packages/task-form/package.json
index cb35c911bf..f33cce3b20 100644
--- a/ui-packages/packages/task-form/package.json
+++ b/ui-packages/packages/task-form/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/form-displayer": "workspace:*",
     "@kogito-apps/task-console-shared": "workspace:*",
diff --git a/ui-packages/packages/task-form/src/api/TaskFormApi.ts b/ui-packages/packages/task-form/src/api/TaskFormApi.ts
index 29c2b45deb..7a313dacc2 100644
--- a/ui-packages/packages/task-form/src/api/TaskFormApi.ts
+++ b/ui-packages/packages/task-form/src/api/TaskFormApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface TaskFormApi {}
diff --git a/ui-packages/packages/task-form/src/api/TaskFormChannelApi.ts b/ui-packages/packages/task-form/src/api/TaskFormChannelApi.ts
index 38b03c893f..932e53f07b 100644
--- a/ui-packages/packages/task-form/src/api/TaskFormChannelApi.ts
+++ b/ui-packages/packages/task-form/src/api/TaskFormChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CustomForm } from '../types';
 
 export interface TaskFormChannelApi {
diff --git a/ui-packages/packages/task-form/src/api/TaskFormDriver.ts b/ui-packages/packages/task-form/src/api/TaskFormDriver.ts
index 493627befc..3bc67b2d97 100644
--- a/ui-packages/packages/task-form/src/api/TaskFormDriver.ts
+++ b/ui-packages/packages/task-form/src/api/TaskFormDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { CustomForm } from '../types';
 
 /**
diff --git a/ui-packages/packages/task-form/src/api/TaskFormEnvelopeApi.ts b/ui-packages/packages/task-form/src/api/TaskFormEnvelopeApi.ts
index a77a28961d..8a8fb20753 100644
--- a/ui-packages/packages/task-form/src/api/TaskFormEnvelopeApi.ts
+++ b/ui-packages/packages/task-form/src/api/TaskFormEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 
 export interface TaskFormEnvelopeApi {
diff --git a/ui-packages/packages/task-form/src/api/index.ts b/ui-packages/packages/task-form/src/api/index.ts
index 189767884b..fb148ac8f7 100644
--- a/ui-packages/packages/task-form/src/api/index.ts
+++ b/ui-packages/packages/task-form/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './TaskFormApi';
 export * from './TaskFormChannelApi';
 export * from './TaskFormEnvelopeApi';
diff --git a/ui-packages/packages/task-form/src/embedded/EmbeddedTaskForm.tsx b/ui-packages/packages/task-form/src/embedded/EmbeddedTaskForm.tsx
index 8c6dcaccb1..bb04c85365 100644
--- a/ui-packages/packages/task-form/src/embedded/EmbeddedTaskForm.tsx
+++ b/ui-packages/packages/task-form/src/embedded/EmbeddedTaskForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
diff --git a/ui-packages/packages/task-form/src/embedded/EmbeddedTaskFormChannelApiImpl.ts b/ui-packages/packages/task-form/src/embedded/EmbeddedTaskFormChannelApiImpl.ts
index 4a708244f5..312ddebe8e 100644
--- a/ui-packages/packages/task-form/src/embedded/EmbeddedTaskFormChannelApiImpl.ts
+++ b/ui-packages/packages/task-form/src/embedded/EmbeddedTaskFormChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { TaskFormChannelApi, TaskFormDriver } from '../api';
 import { CustomForm } from '../types';
 
diff --git a/ui-packages/packages/task-form/src/embedded/index.ts b/ui-packages/packages/task-form/src/embedded/index.ts
index ae2a94e42c..931107ea10 100644
--- a/ui-packages/packages/task-form/src/embedded/index.ts
+++ b/ui-packages/packages/task-form/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedTaskForm';
diff --git a/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskForm.test.tsx b/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskForm.test.tsx
index 392d7cf35d..68ad2a192e 100644
--- a/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskForm.test.tsx
+++ b/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { mount } from 'enzyme';
 import React from 'react';
 import { EmbeddedTaskForm, EmbeddedTaskFormProps } from '../EmbeddedTaskForm';
diff --git a/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskFormChannelApiImpl.test.ts b/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskFormChannelApiImpl.test.ts
index 32e3e99124..ed89c20e2c 100644
--- a/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskFormChannelApiImpl.test.ts
+++ b/ui-packages/packages/task-form/src/embedded/tests/EmbeddedTaskFormChannelApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { TaskFormDriver } from '../../api';
 import { EmbeddedTaskFormChannelApiImpl } from '../EmbeddedTaskFormChannelApiImpl';
 import { MockedTaskFormDriver } from './mocks/Mocks';
diff --git a/ui-packages/packages/task-form/src/embedded/tests/mocks/Mocks.ts b/ui-packages/packages/task-form/src/embedded/tests/mocks/Mocks.ts
index 0a23223002..58b513f355 100644
--- a/ui-packages/packages/task-form/src/embedded/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/task-form/src/embedded/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import { TaskFormDriver } from '../../../api';
 
diff --git a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelope.tsx b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelope.tsx
index 3a08d6b6ee..adccb2dd8d 100644
--- a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelope.tsx
+++ b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeApiImpl.ts b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeApiImpl.ts
index 9af46e13d3..bda02fe170 100644
--- a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeApiImpl.ts
+++ b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { TaskFormEnvelopeViewApi } from './TaskFormEnvelopeView';
 import {
diff --git a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeContext.ts b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeContext.ts
index a35e99c2ff..b668036f66 100644
--- a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeContext.ts
+++ b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeView.tsx b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeView.tsx
index a49435d62e..51b2b85690 100644
--- a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeView.tsx
+++ b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, {
   useCallback,
   useEffect,
diff --git a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeViewDriver.ts b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeViewDriver.ts
index c71ffdeb0b..41feeaf4fd 100644
--- a/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeViewDriver.ts
+++ b/ui-packages/packages/task-form/src/envelope/TaskFormEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { TaskFormChannelApi, TaskFormDriver } from '../api';
 import { CustomForm } from '../types';
diff --git a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/CustomTaskFormDisplayer.tsx b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/CustomTaskFormDisplayer.tsx
index 1fcb749807..40f13e12c7 100644
--- a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/CustomTaskFormDisplayer.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/CustomTaskFormDisplayer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useRef, useState } from 'react';
 import uuidv4 from 'uuid';
 import {
diff --git a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/__mocks__/CustomTaskFormDisplayer.tsx b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/__mocks__/CustomTaskFormDisplayer.tsx
index 6789a73754..f176a9a126 100644
--- a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/__mocks__/CustomTaskFormDisplayer.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/__mocks__/CustomTaskFormDisplayer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedCustomTaskFormDisplayer = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/tests/CustomTaskFormDisplayer.test.tsx b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/tests/CustomTaskFormDisplayer.test.tsx
index a2cf84836f..41eda5a121 100644
--- a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/tests/CustomTaskFormDisplayer.test.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/tests/CustomTaskFormDisplayer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { mount } from 'enzyme';
 import _ from 'lodash';
diff --git a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/tests/utils.test.ts b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/tests/utils.test.ts
index ad2a3a38d8..5dea6b82e5 100644
--- a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/tests/utils.test.ts
+++ b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/tests/utils.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { buildTaskFormContext } from '../utils';
 import { ApplyForVisaForm } from '../../../utils/tests/mocks/ApplyForVisa';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
diff --git a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/utils.ts b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/utils.ts
index 316f6d874d..d770e382a9 100644
--- a/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/utils.ts
+++ b/ui-packages/packages/task-form/src/envelope/components/CustomTaskFormDisplayer/utils/utils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import cloneDeep from 'lodash/cloneDeep';
 import unset from 'lodash/unset';
 import { User } from '../../../../api';
diff --git a/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/EmptyTaskForm.tsx b/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/EmptyTaskForm.tsx
index 91cb3ac36e..76d8b17896 100644
--- a/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/EmptyTaskForm.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/EmptyTaskForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import _ from 'lodash';
 import {
diff --git a/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/__mocks__/EmptyTaskForm.tsx b/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/__mocks__/EmptyTaskForm.tsx
index f11b0ff5d8..1acea1b125 100644
--- a/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/__mocks__/EmptyTaskForm.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/__mocks__/EmptyTaskForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedEmptyTaskForm = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/tests/EmptyTaskForm.test.tsx b/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/tests/EmptyTaskForm.test.tsx
index f958fb6a5d..60d44278c8 100644
--- a/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/tests/EmptyTaskForm.test.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/EmptyTaskForm/tests/EmptyTaskForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import _ from 'lodash';
 import { Button } from '@patternfly/react-core/dist/js/components/Button';
diff --git a/ui-packages/packages/task-form/src/envelope/components/TaskForm/TaskForm.tsx b/ui-packages/packages/task-form/src/envelope/components/TaskForm/TaskForm.tsx
index 89076a264a..5890f8faa8 100644
--- a/ui-packages/packages/task-form/src/envelope/components/TaskForm/TaskForm.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/TaskForm/TaskForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import get from 'lodash/get';
 import has from 'lodash/has';
diff --git a/ui-packages/packages/task-form/src/envelope/components/TaskForm/__mocks__/TaskForm.tsx b/ui-packages/packages/task-form/src/envelope/components/TaskForm/__mocks__/TaskForm.tsx
index bb76d1e8ae..a7aa4af651 100644
--- a/ui-packages/packages/task-form/src/envelope/components/TaskForm/__mocks__/TaskForm.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/TaskForm/__mocks__/TaskForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedTaskForm = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-form/src/envelope/components/TaskForm/tests/TaskForm.test.tsx b/ui-packages/packages/task-form/src/envelope/components/TaskForm/tests/TaskForm.test.tsx
index c9861ebc52..6318e2c4ae 100644
--- a/ui-packages/packages/task-form/src/envelope/components/TaskForm/tests/TaskForm.test.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/TaskForm/tests/TaskForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import _ from 'lodash';
diff --git a/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/TaskFormRenderer.tsx b/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/TaskFormRenderer.tsx
index 169b876f4e..2ba909b386 100644
--- a/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/TaskFormRenderer.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/TaskFormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 import {
diff --git a/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/__mocks__/TaskFormRenderer.tsx b/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/__mocks__/TaskFormRenderer.tsx
index 7cc27bb416..6f5fcf1c8e 100644
--- a/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/__mocks__/TaskFormRenderer.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/__mocks__/TaskFormRenderer.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedTaskFormRenderer = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/tests/TaskFormRenderer.test.tsx b/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/tests/TaskFormRenderer.test.tsx
index 658d11079d..86125a5f91 100644
--- a/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/tests/TaskFormRenderer.test.tsx
+++ b/ui-packages/packages/task-form/src/envelope/components/TaskFormRenderer/tests/TaskFormRenderer.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import _ from 'lodash';
diff --git a/ui-packages/packages/task-form/src/envelope/components/utils/TaskFormDataUtils.ts b/ui-packages/packages/task-form/src/envelope/components/utils/TaskFormDataUtils.ts
index 12232dda78..96fbe2027b 100644
--- a/ui-packages/packages/task-form/src/envelope/components/utils/TaskFormDataUtils.ts
+++ b/ui-packages/packages/task-form/src/envelope/components/utils/TaskFormDataUtils.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
diff --git a/ui-packages/packages/task-form/src/envelope/components/utils/tests/TaskFormDataUtils.test.ts b/ui-packages/packages/task-form/src/envelope/components/utils/tests/TaskFormDataUtils.test.ts
index eb1c303444..683ba5bc36 100644
--- a/ui-packages/packages/task-form/src/envelope/components/utils/tests/TaskFormDataUtils.test.ts
+++ b/ui-packages/packages/task-form/src/envelope/components/utils/tests/TaskFormDataUtils.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import _ from 'lodash';
 import {
   generateFormData,
diff --git a/ui-packages/packages/task-form/src/envelope/components/utils/tests/mocks/ApplyForVisa.ts b/ui-packages/packages/task-form/src/envelope/components/utils/tests/mocks/ApplyForVisa.ts
index ada2a0b1db..e783a73f6e 100644
--- a/ui-packages/packages/task-form/src/envelope/components/utils/tests/mocks/ApplyForVisa.ts
+++ b/ui-packages/packages/task-form/src/envelope/components/utils/tests/mocks/ApplyForVisa.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { SCHEMA_VERSION } from '@kogito-apps/components-common/dist/types';
 
 export const ApplyForVisaForm = {
diff --git a/ui-packages/packages/task-form/src/envelope/index.ts b/ui-packages/packages/task-form/src/envelope/index.ts
index b251edeb84..f99a0c0088 100644
--- a/ui-packages/packages/task-form/src/envelope/index.ts
+++ b/ui-packages/packages/task-form/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './TaskFormEnvelope';
diff --git a/ui-packages/packages/task-form/src/envelope/styles.css b/ui-packages/packages/task-form/src/envelope/styles.css
index dfa75068f7..4d06670caa 100644
--- a/ui-packages/packages/task-form/src/envelope/styles.css
+++ b/ui-packages/packages/task-form/src/envelope/styles.css
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-task-form-container {
-    height: 100%;
-}
\ No newline at end of file
+  height: 100%;
+}
diff --git a/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeApiImpl.test.ts b/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeApiImpl.test.ts
index 63e66eece4..6cbe205a6b 100644
--- a/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import {
   MockedEnvelopeClient,
diff --git a/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeView.test.tsx b/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeView.test.tsx
index e78342deb2..5c21b0597d 100644
--- a/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeView.test.tsx
+++ b/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import wait from 'waait';
diff --git a/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeViewDriver.test.ts b/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeViewDriver.test.ts
index 30db27151b..9dec8225a7 100644
--- a/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/task-form/src/envelope/tests/TaskFormEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/task-form/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/task-form/src/envelope/tests/mocks/Mocks.ts
index 653a1e0af5..d99144de9f 100644
--- a/ui-packages/packages/task-form/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/task-form/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ApiNotificationConsumers,
   MessageBusClientApi,
diff --git a/ui-packages/packages/task-form/src/index.ts b/ui-packages/packages/task-form/src/index.ts
index b1593d9e4d..cfac373ffd 100644
--- a/ui-packages/packages/task-form/src/index.ts
+++ b/ui-packages/packages/task-form/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/task-form/src/types/index.ts b/ui-packages/packages/task-form/src/types/index.ts
index 580ec85cc7..9d53b92978 100644
--- a/ui-packages/packages/task-form/src/types/index.ts
+++ b/ui-packages/packages/task-form/src/types/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './types';
diff --git a/ui-packages/packages/task-form/src/types/types.ts b/ui-packages/packages/task-form/src/types/types.ts
index 0fda6a52bc..7c89d49414 100644
--- a/ui-packages/packages/task-form/src/types/types.ts
+++ b/ui-packages/packages/task-form/src/types/types.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 export enum FormType {
   HTML = 'HTML',
diff --git a/ui-packages/packages/task-inbox/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/task-inbox/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/task-inbox/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/task-inbox/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/task-inbox/config/Jest-config/fileMocks.js b/ui-packages/packages/task-inbox/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/task-inbox/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/task-inbox/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/task-inbox/config/Jest-config/global-setup.js b/ui-packages/packages/task-inbox/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/task-inbox/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/task-inbox/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/task-inbox/config/Jest-config/styleMocks.js b/ui-packages/packages/task-inbox/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/task-inbox/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/task-inbox/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/task-inbox/config/Jest-config/test-setup.js b/ui-packages/packages/task-inbox/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/task-inbox/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/task-inbox/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/task-inbox/config/Jest-config/test-shim.js b/ui-packages/packages/task-inbox/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/task-inbox/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/task-inbox/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/task-inbox/package.json b/ui-packages/packages/task-inbox/package.json
index 150cbac712..5ea2fca1fe 100644
--- a/ui-packages/packages/task-inbox/package.json
+++ b/ui-packages/packages/task-inbox/package.json
@@ -28,8 +28,8 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@kogito-apps/task-console-shared": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
diff --git a/ui-packages/packages/task-inbox/src/api/TaskInboxApi.ts b/ui-packages/packages/task-inbox/src/api/TaskInboxApi.ts
index dde69957dc..d8ddd132e9 100644
--- a/ui-packages/packages/task-inbox/src/api/TaskInboxApi.ts
+++ b/ui-packages/packages/task-inbox/src/api/TaskInboxApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface TaskInboxApi {
   taskInbox__notify: (userName: string) => Promise<void>;
 }
diff --git a/ui-packages/packages/task-inbox/src/api/TaskInboxChannelApi.ts b/ui-packages/packages/task-inbox/src/api/TaskInboxChannelApi.ts
index 6260ec881b..a619ab881c 100644
--- a/ui-packages/packages/task-inbox/src/api/TaskInboxChannelApi.ts
+++ b/ui-packages/packages/task-inbox/src/api/TaskInboxChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import { QueryFilter, SortBy, TaskInboxState } from './TaskInboxEnvelopeApi';
 
diff --git a/ui-packages/packages/task-inbox/src/api/TaskInboxDriver.ts b/ui-packages/packages/task-inbox/src/api/TaskInboxDriver.ts
index e8f83da0eb..1193cabf9a 100644
--- a/ui-packages/packages/task-inbox/src/api/TaskInboxDriver.ts
+++ b/ui-packages/packages/task-inbox/src/api/TaskInboxDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import { QueryFilter, SortBy, TaskInboxState } from './TaskInboxEnvelopeApi';
 
diff --git a/ui-packages/packages/task-inbox/src/api/TaskInboxEnvelopeApi.ts b/ui-packages/packages/task-inbox/src/api/TaskInboxEnvelopeApi.ts
index 9acd93d8ab..837999b9ad 100644
--- a/ui-packages/packages/task-inbox/src/api/TaskInboxEnvelopeApi.ts
+++ b/ui-packages/packages/task-inbox/src/api/TaskInboxEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * Envelope Api
  */
diff --git a/ui-packages/packages/task-inbox/src/api/index.ts b/ui-packages/packages/task-inbox/src/api/index.ts
index be798f1710..f92bcc2e14 100644
--- a/ui-packages/packages/task-inbox/src/api/index.ts
+++ b/ui-packages/packages/task-inbox/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './TaskInboxApi';
 export * from './TaskInboxChannelApi';
 export * from './TaskInboxEnvelopeApi';
diff --git a/ui-packages/packages/task-inbox/src/embedded/EmbeddedTaskInbox.tsx b/ui-packages/packages/task-inbox/src/embedded/EmbeddedTaskInbox.tsx
index 3d3722e81b..318f5f8426 100644
--- a/ui-packages/packages/task-inbox/src/embedded/EmbeddedTaskInbox.tsx
+++ b/ui-packages/packages/task-inbox/src/embedded/EmbeddedTaskInbox.tsx
@@ -1,17 +1,20 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
diff --git a/ui-packages/packages/task-inbox/src/embedded/TaskInboxChannelApiImpl.ts b/ui-packages/packages/task-inbox/src/embedded/TaskInboxChannelApiImpl.ts
index edf943f41c..412026568d 100644
--- a/ui-packages/packages/task-inbox/src/embedded/TaskInboxChannelApiImpl.ts
+++ b/ui-packages/packages/task-inbox/src/embedded/TaskInboxChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import {
   QueryFilter,
diff --git a/ui-packages/packages/task-inbox/src/embedded/__mocks__/EmbeddedTaskInbox.tsx b/ui-packages/packages/task-inbox/src/embedded/__mocks__/EmbeddedTaskInbox.tsx
index e60c8628af..83d800d09a 100644
--- a/ui-packages/packages/task-inbox/src/embedded/__mocks__/EmbeddedTaskInbox.tsx
+++ b/ui-packages/packages/task-inbox/src/embedded/__mocks__/EmbeddedTaskInbox.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedEmbeddedTaskInbox = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-inbox/src/embedded/index.ts b/ui-packages/packages/task-inbox/src/embedded/index.ts
index 7aaffeb4d8..dc64b31915 100644
--- a/ui-packages/packages/task-inbox/src/embedded/index.ts
+++ b/ui-packages/packages/task-inbox/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedTaskInbox';
diff --git a/ui-packages/packages/task-inbox/src/embedded/tests/EmbeddedTaskInbox.test.tsx b/ui-packages/packages/task-inbox/src/embedded/tests/EmbeddedTaskInbox.test.tsx
index f7763e69e5..a4f712af65 100644
--- a/ui-packages/packages/task-inbox/src/embedded/tests/EmbeddedTaskInbox.test.tsx
+++ b/ui-packages/packages/task-inbox/src/embedded/tests/EmbeddedTaskInbox.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { EmbeddedTaskInbox } from '../EmbeddedTaskInbox';
 import { MockedTaskInboxDriver } from './utils/Mocks';
diff --git a/ui-packages/packages/task-inbox/src/embedded/tests/TaskInboxChannelApiImpl.test.ts b/ui-packages/packages/task-inbox/src/embedded/tests/TaskInboxChannelApiImpl.test.ts
index 2f48f44465..a66583f6be 100644
--- a/ui-packages/packages/task-inbox/src/embedded/tests/TaskInboxChannelApiImpl.test.ts
+++ b/ui-packages/packages/task-inbox/src/embedded/tests/TaskInboxChannelApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import { TaskInboxChannelApiImpl } from '../TaskInboxChannelApiImpl';
 import {
diff --git a/ui-packages/packages/task-inbox/src/embedded/tests/utils/Mocks.ts b/ui-packages/packages/task-inbox/src/embedded/tests/utils/Mocks.ts
index 7805d103d8..b04b3a3e0c 100644
--- a/ui-packages/packages/task-inbox/src/embedded/tests/utils/Mocks.ts
+++ b/ui-packages/packages/task-inbox/src/embedded/tests/utils/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { TaskInboxDriver } from '../../../api';
 
 export const MockedTaskInboxDriver = jest.fn<TaskInboxDriver, []>(() => ({
diff --git a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelope.tsx b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelope.tsx
index 93ecbc6e3c..afb2fb3a8e 100644
--- a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelope.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeApiImpl.ts b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeApiImpl.ts
index 7db431d65a..287319ff95 100644
--- a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeApiImpl.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { TaskInboxEnvelopeViewApi } from './TaskInboxEnvelopeView';
 import {
diff --git a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeContext.ts b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeContext.ts
index 4b7714f612..ab7379c65b 100644
--- a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeContext.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeView.tsx b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeView.tsx
index 8428552636..b80c82eff4 100644
--- a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeView.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useImperativeHandle, useState } from 'react';
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import _ from 'lodash';
diff --git a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeViewDriver.ts b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeViewDriver.ts
index ad5f8e6b2a..2993bf171c 100644
--- a/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeViewDriver.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/TaskInboxEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import {
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/TaskDescription.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/TaskDescription.tsx
index cbfe9f4f32..af4977a916 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/TaskDescription.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/TaskDescription.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { ItemDescriptor } from '@kogito-apps/components-common/dist/components/ItemDescriptor';
 import {
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/__mocks__/TaskDescription.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/__mocks__/TaskDescription.tsx
index 5ebc194cfe..0964e27935 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/__mocks__/TaskDescription.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/__mocks__/TaskDescription.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedTaskDescription = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/tests/TaskDescription.test.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/tests/TaskDescription.test.tsx
index acbcbab289..b33e936e69 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/tests/TaskDescription.test.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskDescription/tests/TaskDescription.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import TaskDescription from '../TaskDescription';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/TaskInbox.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/TaskInbox.tsx
index 5285ca3310..aa9bf7c4a9 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/TaskInbox.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/TaskInbox.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 import { Bullseye } from '@patternfly/react-core/dist/js/layouts/Bullseye';
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/__mocks__/TaskInbox.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/__mocks__/TaskInbox.tsx
index c1fc46f638..8a0b68c652 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/__mocks__/TaskInbox.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/__mocks__/TaskInbox.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedTaskInbox = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/TaskInbox.test.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/TaskInbox.test.tsx
index 9ad1a26963..9f02a22c3c 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/TaskInbox.test.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/TaskInbox.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import wait from 'waait';
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/MockData.ts b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/MockData.ts
index 9cda520769..b87dc8f156 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/MockData.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/MockData.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 
 export const userTasks: UserTaskInstance[] = [
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/TestTaskInboxDriver.ts b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/TestTaskInboxDriver.ts
index 63f6e314d2..2db4d96e48 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/TestTaskInboxDriver.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInbox/tests/mocks/TestTaskInboxDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { UserTaskInstance } from '@kogito-apps/task-console-shared';
 import {
   QueryFilter,
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/TaskInboxToolbar.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/TaskInboxToolbar.tsx
index 3b6ff79f4a..57fdf9682a 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/TaskInboxToolbar.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/TaskInboxToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useEffect, useState } from 'react';
 import {
   ToolbarFilter,
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/__mocks__/TaskInboxToolbar.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/__mocks__/TaskInboxToolbar.tsx
index 0f426bc942..34e2920485 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/__mocks__/TaskInboxToolbar.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/__mocks__/TaskInboxToolbar.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockTaskInboxToolbar = (): React.ReactElement => {
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/tests/TaskInboxToolbar.test.tsx b/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/tests/TaskInboxToolbar.test.tsx
index aea382c424..82c8a0ef21 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/tests/TaskInboxToolbar.test.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/TaskInboxToolbar/tests/TaskInboxToolbar.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { FormEvent } from 'react';
 import { mount } from 'enzyme';
 import TaskInboxToolbar from '../TaskInboxToolbar';
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/utils/TaskInboxUtils.tsx b/ui-packages/packages/task-inbox/src/envelope/components/utils/TaskInboxUtils.tsx
index e1e9c376f1..6ce04cc98f 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/utils/TaskInboxUtils.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/components/utils/TaskInboxUtils.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import Moment from 'react-moment';
 import TaskDescription from '../TaskDescription/TaskDescription';
diff --git a/ui-packages/packages/task-inbox/src/envelope/components/utils/tests/TaskInboxUtils.test.ts b/ui-packages/packages/task-inbox/src/envelope/components/utils/tests/TaskInboxUtils.test.ts
index 6a9e97d6f6..d4128c7513 100644
--- a/ui-packages/packages/task-inbox/src/envelope/components/utils/tests/TaskInboxUtils.test.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/components/utils/tests/TaskInboxUtils.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   getDateColumn,
   getDefaultColumn,
diff --git a/ui-packages/packages/task-inbox/src/envelope/index.ts b/ui-packages/packages/task-inbox/src/envelope/index.ts
index a446f120db..de8bf30edd 100644
--- a/ui-packages/packages/task-inbox/src/envelope/index.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './TaskInboxEnvelope';
diff --git a/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeApiImpl.test.ts b/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeApiImpl.test.ts
index b5ce757da9..b39834cba4 100644
--- a/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MockedEnvelopeClient,
   MockedTaskInboxEnvelopeViewApi
diff --git a/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeView.test.tsx b/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeView.test.tsx
index f2164e8e38..a99a83b562 100644
--- a/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeView.test.tsx
+++ b/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeViewDriver.test.ts b/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeViewDriver.test.ts
index b90cafefd0..4aaa39d685 100644
--- a/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/tests/TaskInboxEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames,
diff --git a/ui-packages/packages/task-inbox/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/task-inbox/src/envelope/tests/mocks/Mocks.ts
index 905bffc767..e5540e7283 100644
--- a/ui-packages/packages/task-inbox/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/task-inbox/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ApiNotificationConsumers,
   MessageBusClientApi,
diff --git a/ui-packages/packages/task-inbox/src/index.ts b/ui-packages/packages/task-inbox/src/index.ts
index f94f2e9e30..b661b98a15 100644
--- a/ui-packages/packages/task-inbox/src/index.ts
+++ b/ui-packages/packages/task-inbox/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/packages/trusty/api-mock/counterfactualPoll.js b/ui-packages/packages/trusty/api-mock/counterfactualPoll.js
index 3f538bff16..461e781718 100644
--- a/ui-packages/packages/trusty/api-mock/counterfactualPoll.js
+++ b/ui-packages/packages/trusty/api-mock/counterfactualPoll.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const faker = require('faker');
 const inputData = require('./mocks/inputData');
 
@@ -10,12 +28,12 @@ const maxRunningTimeSeconds = 30;
 
 module.exports = (req, res, next) => {
   const _send = res.send;
-  res.send = function(body) {
+  res.send = function (body) {
     if (req.path === '/counterfactuals') {
       const query = req.query;
       if (req.method === 'POST') {
         searchDomains = req.body.searchDomains.filter(
-          domain => domain.value.fixed === false
+          (domain) => domain.value.fixed === false
         );
         try {
           return _send.call(
@@ -93,10 +111,11 @@ function getResult(executionId, baseId, searchDomains, isFinal) {
     solutionId: (baseId + 1).toString(),
     stage: isFinal ? 'FINAL' : 'INTERMEDIATE',
     inputs: inputData
-      .find(data => data.executionId === executionId)
-      .inputs.map(input => {
+      .find((data) => data.executionId === executionId)
+      .inputs.map((input) => {
         if (
-          searchDomains.filter(domain => domain.name === input.name).length > 0
+          searchDomains.filter((domain) => domain.name === input.name).length >
+          0
         ) {
           return {
             ...input,
diff --git a/ui-packages/packages/trusty/api-mock/db.js b/ui-packages/packages/trusty/api-mock/db.js
index 046798dd3d..cbac44ec5f 100644
--- a/ui-packages/packages/trusty/api-mock/db.js
+++ b/ui-packages/packages/trusty/api-mock/db.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const faker = require('faker');
 const inputData = require('./mocks/inputData');
 const outcomeData = require('./mocks/outcomes');
diff --git a/ui-packages/packages/trusty/api-mock/filterSingular.js b/ui-packages/packages/trusty/api-mock/filterSingular.js
index 943f71b359..b91ebc7ac2 100644
--- a/ui-packages/packages/trusty/api-mock/filterSingular.js
+++ b/ui-packages/packages/trusty/api-mock/filterSingular.js
@@ -1,6 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = (req, res, next) => {
   const _send = res.send;
-  res.send = function(body) {
+  res.send = function (body) {
     if (require('url').parse(req.url, true).query['singular']) {
       try {
         const json = JSON.parse(body);
diff --git a/ui-packages/packages/trusty/api-mock/mocks/counterfactuals.js b/ui-packages/packages/trusty/api-mock/mocks/counterfactuals.js
index 08d6ce6367..a4e5e298f2 100644
--- a/ui-packages/packages/trusty/api-mock/mocks/counterfactuals.js
+++ b/ui-packages/packages/trusty/api-mock/mocks/counterfactuals.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const counterfactuals = {
   executionId: 'executionId',
   counterfactualId: 'counterfactualId',
diff --git a/ui-packages/packages/trusty/api-mock/mocks/executionIds.js b/ui-packages/packages/trusty/api-mock/mocks/executionIds.js
index 3c459edad7..726e03a6cb 100644
--- a/ui-packages/packages/trusty/api-mock/mocks/executionIds.js
+++ b/ui-packages/packages/trusty/api-mock/mocks/executionIds.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = [
   'strings--4979-4e03-8692-0ec45cfca6ac',
   'unsuppor-ted--outc-omes-9437efcd449a',
diff --git a/ui-packages/packages/trusty/api-mock/mocks/inputData.js b/ui-packages/packages/trusty/api-mock/mocks/inputData.js
index ce5cf32a83..cc43e5da31 100644
--- a/ui-packages/packages/trusty/api-mock/mocks/inputData.js
+++ b/ui-packages/packages/trusty/api-mock/mocks/inputData.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const executionIds = require('./executionIds');
 
 const simpleInputData = [
diff --git a/ui-packages/packages/trusty/api-mock/mocks/modelData.js b/ui-packages/packages/trusty/api-mock/mocks/modelData.js
index 55cc89931d..deb9836205 100644
--- a/ui-packages/packages/trusty/api-mock/mocks/modelData.js
+++ b/ui-packages/packages/trusty/api-mock/mocks/modelData.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const executionIds = require('./executionIds');
 const DMN_1 = `
   <dmn:definitions xmlns:dmn="http://www.omg.org/spec/DMN/20180521/MODEL/" xmlns="https://kiegroup.org/dmn/_84627CF5-6B15-47D8-A943-40555270CCEC" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:kie="http://www.drools.org/kie/dmn/1.2" xmlns:dmndi="http://www.omg.org/spec/DMN/20180521/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:feel="http://www.omg.org/spec/DMN/20180521/FEEL/" id="_66A7B1AB-61EF-4E13-B41E-46C928698EE2" name="fraud-score" typeLanguage="http://www.omg.org/spec/DMN/20180521/FEEL/" namespace="https://kiegroup.org/dmn/_84627CF5-6B15-47D8-A943-40555270CCEC">
diff --git a/ui-packages/packages/trusty/api-mock/mocks/outcomeDetail.js b/ui-packages/packages/trusty/api-mock/mocks/outcomeDetail.js
index fd704952b1..ace8e866c4 100644
--- a/ui-packages/packages/trusty/api-mock/mocks/outcomeDetail.js
+++ b/ui-packages/packages/trusty/api-mock/mocks/outcomeDetail.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const outcomeDetail = [
   {
     evaluationStatus: 'SUCCEEDED',
diff --git a/ui-packages/packages/trusty/api-mock/mocks/outcomes.js b/ui-packages/packages/trusty/api-mock/mocks/outcomes.js
index 60fcb02831..9406a60066 100644
--- a/ui-packages/packages/trusty/api-mock/mocks/outcomes.js
+++ b/ui-packages/packages/trusty/api-mock/mocks/outcomes.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const executionIds = require('./executionIds');
 
 const twoSimpleOutcomes = [
diff --git a/ui-packages/packages/trusty/api-mock/mocks/saliencies.js b/ui-packages/packages/trusty/api-mock/mocks/saliencies.js
index fb12d845d3..6a41f08b9a 100644
--- a/ui-packages/packages/trusty/api-mock/mocks/saliencies.js
+++ b/ui-packages/packages/trusty/api-mock/mocks/saliencies.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const faker = require('faker');
 
 const saliencies = {
@@ -42,7 +60,7 @@ for (let i = features.length - 1; i >= 0; i--) {
   features[j] = temp;
 }
 
-outcomes.forEach(item => {
+outcomes.forEach((item) => {
   const outcome = {
     outcomeId: item,
     featureImportance: []
diff --git a/ui-packages/packages/trusty/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/trusty/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/trusty/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/trusty/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/trusty/config/Jest-config/fileMocks.js b/ui-packages/packages/trusty/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/trusty/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/trusty/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/trusty/config/Jest-config/global-setup.js b/ui-packages/packages/trusty/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/trusty/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/trusty/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/trusty/config/Jest-config/styleMocks.js b/ui-packages/packages/trusty/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/trusty/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/trusty/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/trusty/config/Jest-config/test-setup.js b/ui-packages/packages/trusty/config/Jest-config/test-setup.js
index fa68854d2d..b1d3afbcd8 100755
--- a/ui-packages/packages/trusty/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/trusty/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const enzyme = require('enzyme');
 const Adapter = require('@wojtekmaj/enzyme-adapter-react-17');
 const { TextDecoder } = require('util');
diff --git a/ui-packages/packages/trusty/config/Jest-config/test-shim.js b/ui-packages/packages/trusty/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/trusty/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/trusty/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/trusty/config/declare.d.ts b/ui-packages/packages/trusty/config/declare.d.ts
index 0004da08d4..3cfbfeeca3 100644
--- a/ui-packages/packages/trusty/config/declare.d.ts
+++ b/ui-packages/packages/trusty/config/declare.d.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 declare module '*.svg' {
   const content: string;
   export default content;
diff --git a/ui-packages/packages/trusty/cypress/cypress.e2e.ts b/ui-packages/packages/trusty/cypress/cypress.e2e.ts
index 681c8e7838..f15ffb7bf9 100644
--- a/ui-packages/packages/trusty/cypress/cypress.e2e.ts
+++ b/ui-packages/packages/trusty/cypress/cypress.e2e.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
@@ -13,7 +31,7 @@ export default defineConfig({
     chromeWebSecurity: false,
     reporter: 'junit',
     reporterOptions: {
-      mochaFile: 'target/surefire-reports/TEST-e2e-[hash].xml',
+      mochaFile: 'cypress-results/TEST-e2e-[hash]/junit.xml',
       toConsole: false
     },
     setupNodeEvents(on, config) {
diff --git a/ui-packages/packages/trusty/cypress/cypress.it.ts b/ui-packages/packages/trusty/cypress/cypress.it.ts
index 97cb0efe82..39f963bb44 100644
--- a/ui-packages/packages/trusty/cypress/cypress.it.ts
+++ b/ui-packages/packages/trusty/cypress/cypress.it.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
@@ -13,7 +31,7 @@ export default defineConfig({
     chromeWebSecurity: false,
     reporter: 'junit',
     reporterOptions: {
-      mochaFile: 'target/surefire-reports/TEST-e2e-[hash].xml',
+      mochaFile: 'cypress-results/TEST-it-[hash]/junit.xml',
       toConsole: false
     },
     setupNodeEvents(on, config) {
diff --git a/ui-packages/packages/trusty/cypress/docker-compose/build.sh b/ui-packages/packages/trusty/cypress/docker-compose/build.sh
index ae62990ddf..490cb1e21a 100755
--- a/ui-packages/packages/trusty/cypress/docker-compose/build.sh
+++ b/ui-packages/packages/trusty/cypress/docker-compose/build.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 
 trap finish SIGTERM EXIT
 
diff --git a/ui-packages/packages/trusty/cypress/docker-compose/docker-compose.yml b/ui-packages/packages/trusty/cypress/docker-compose/docker-compose.yml
index fdae62a75c..89808612ab 100644
--- a/ui-packages/packages/trusty/cypress/docker-compose/docker-compose.yml
+++ b/ui-packages/packages/trusty/cypress/docker-compose/docker-compose.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 version: '2'
 
 services:
diff --git a/ui-packages/packages/trusty/cypress/docker-compose/infinispan/infinispan.xml b/ui-packages/packages/trusty/cypress/docker-compose/infinispan/infinispan.xml
index 55bb6bf39f..e5ce93f4a9 100644
--- a/ui-packages/packages/trusty/cypress/docker-compose/infinispan/infinispan.xml
+++ b/ui-packages/packages/trusty/cypress/docker-compose/infinispan/infinispan.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <infinispan xmlns='urn:infinispan:config:10.0' xsi:schemaLocation='urn:infinispan:config:10.0 http://www.infinispan.org/schemas/infinispan-config-10.0.xsd                             urn:infinispan:server:10.0 http://www.infinispan.org/schemas/infinispan-server-10.0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
     <cache-container name="default"/>
     <server xmlns='urn:infinispan:server:10.0'>
diff --git a/ui-packages/packages/trusty/cypress/docker-compose/start_docker.sh b/ui-packages/packages/trusty/cypress/docker-compose/start_docker.sh
index 1642db6776..ec8fd63c67 100755
--- a/ui-packages/packages/trusty/cypress/docker-compose/start_docker.sh
+++ b/ui-packages/packages/trusty/cypress/docker-compose/start_docker.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 
 trap finish SIGTERM EXIT
 
diff --git a/ui-packages/packages/trusty/cypress/e2e/TrafficViolation.ts b/ui-packages/packages/trusty/cypress/e2e/TrafficViolation.ts
index 1b57cb5974..85afcf2604 100644
--- a/ui-packages/packages/trusty/cypress/e2e/TrafficViolation.ts
+++ b/ui-packages/packages/trusty/cypress/e2e/TrafficViolation.ts
@@ -1,17 +1,20 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 let reqId;
 let auditDetailsUrl;
diff --git a/ui-packages/packages/trusty/cypress/e2e/smoke/SmokeTest.cy.ts b/ui-packages/packages/trusty/cypress/e2e/smoke/SmokeTest.cy.ts
index ce8346c818..467f9c5957 100644
--- a/ui-packages/packages/trusty/cypress/e2e/smoke/SmokeTest.cy.ts
+++ b/ui-packages/packages/trusty/cypress/e2e/smoke/SmokeTest.cy.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 describe('E2E - smoke test', () => {
   beforeEach(() => {
     cy.visit('/');
diff --git a/ui-packages/packages/trusty/cypress/integration/AuditDetails.cy.ts b/ui-packages/packages/trusty/cypress/integration/AuditDetails.cy.ts
index 8bf00fdec1..8212b53c0f 100644
--- a/ui-packages/packages/trusty/cypress/integration/AuditDetails.cy.ts
+++ b/ui-packages/packages/trusty/cypress/integration/AuditDetails.cy.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 describe('Audit Details Header', () => {
   beforeEach(() => {
     cy.visit('/');
diff --git a/ui-packages/packages/trusty/cypress/integration/Outcomes.cy.ts b/ui-packages/packages/trusty/cypress/integration/Outcomes.cy.ts
index 373df09004..0ee397c81f 100644
--- a/ui-packages/packages/trusty/cypress/integration/Outcomes.cy.ts
+++ b/ui-packages/packages/trusty/cypress/integration/Outcomes.cy.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 describe('Outcomes - verify mocked data', () => {
   beforeEach(() => {
     cy.visit('/');
diff --git a/ui-packages/packages/trusty/cypress/integration/smoke/BasicTest.cy.ts b/ui-packages/packages/trusty/cypress/integration/smoke/BasicTest.cy.ts
index 0a2442f59e..01c3120788 100644
--- a/ui-packages/packages/trusty/cypress/integration/smoke/BasicTest.cy.ts
+++ b/ui-packages/packages/trusty/cypress/integration/smoke/BasicTest.cy.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 describe('Basic Elements', () => {
   beforeEach(() => {
     cy.visit('/');
diff --git a/ui-packages/packages/trusty/cypress/plugins/index.ts b/ui-packages/packages/trusty/cypress/plugins/index.ts
index 605f2bdb94..0f5772de71 100644
--- a/ui-packages/packages/trusty/cypress/plugins/index.ts
+++ b/ui-packages/packages/trusty/cypress/plugins/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * @type {Cypress.PluginConfig}
  */
diff --git a/ui-packages/packages/trusty/cypress/support/index.ts b/ui-packages/packages/trusty/cypress/support/index.ts
index f354ffe087..ae2cc960d1 100644
--- a/ui-packages/packages/trusty/cypress/support/index.ts
+++ b/ui-packages/packages/trusty/cypress/support/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import '@kogito-apps/cypress-ouia';
diff --git a/ui-packages/packages/trusty/dev-webapp/index.css b/ui-packages/packages/trusty/dev-webapp/index.css
index 8b96724f25..0e5c186331 100644
--- a/ui-packages/packages/trusty/dev-webapp/index.css
+++ b/ui-packages/packages/trusty/dev-webapp/index.css
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 body {
   margin: 0;
   -webkit-font-smoothing: antialiased;
diff --git a/ui-packages/packages/trusty/dev-webapp/index.html b/ui-packages/packages/trusty/dev-webapp/index.html
index ff0d982d06..2abd78e6d2 100644
--- a/ui-packages/packages/trusty/dev-webapp/index.html
+++ b/ui-packages/packages/trusty/dev-webapp/index.html
@@ -1,14 +1,34 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE html>
 <html lang="en-US">
-<head>
+  <head>
     <title>Kogito - Trusty AI</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="shortcut icon" href="/favicon.ico">
-</head>
-<body>
-<noscript>Enabling JavaScript is required to run this app.</noscript>
-<div id="root"></div>
-<script src="/app.bundle.js"></script>
-</body>
+    <link rel="shortcut icon" href="/favicon.ico" />
+  </head>
+  <body>
+    <noscript>Enabling JavaScript is required to run this app.</noscript>
+    <div id="root"></div>
+    <script src="/app.bundle.js"></script>
+  </body>
 </html>
diff --git a/ui-packages/packages/trusty/dev-webapp/index.tsx b/ui-packages/packages/trusty/dev-webapp/index.tsx
index 21c2dd9eeb..7473ca9cfc 100644
--- a/ui-packages/packages/trusty/dev-webapp/index.tsx
+++ b/ui-packages/packages/trusty/dev-webapp/index.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import '@patternfly/react-core/dist/styles/base.css';
diff --git a/ui-packages/packages/trusty/dev-webapp/webpack.config.js b/ui-packages/packages/trusty/dev-webapp/webpack.config.js
index a6911a310a..cfcb8c85b7 100644
--- a/ui-packages/packages/trusty/dev-webapp/webpack.config.js
+++ b/ui-packages/packages/trusty/dev-webapp/webpack.config.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const CopyPlugin = require('copy-webpack-plugin');
 const webpack = require('webpack');
 
diff --git a/ui-packages/packages/trusty/dev-webapp/webpack.dev.js b/ui-packages/packages/trusty/dev-webapp/webpack.dev.js
index 4cca7aeaae..60215d6c8a 100644
--- a/ui-packages/packages/trusty/dev-webapp/webpack.dev.js
+++ b/ui-packages/packages/trusty/dev-webapp/webpack.dev.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { merge } = require('webpack-merge');
 const common = require('./webpack.config.js');
 const path = require('path');
diff --git a/ui-packages/packages/trusty/dev-webapp/webpack.prod.js b/ui-packages/packages/trusty/dev-webapp/webpack.prod.js
index f4b527ebe5..d69d17ea16 100644
--- a/ui-packages/packages/trusty/dev-webapp/webpack.prod.js
+++ b/ui-packages/packages/trusty/dev-webapp/webpack.prod.js
@@ -1,7 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { merge } = require('webpack-merge');
 const common = require('./webpack.config.js');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const path = require('path');
 const CopyPlugin = require('copy-webpack-plugin');
 
diff --git a/ui-packages/packages/trusty/package.json b/ui-packages/packages/trusty/package.json
index 7397490bb2..b20e932ab8 100644
--- a/ui-packages/packages/trusty/package.json
+++ b/ui-packages/packages/trusty/package.json
@@ -14,7 +14,7 @@
     "url": "https://github.com/kiegroup/kogito-apps.git"
   },
   "dependencies": {
-    "@kie-tools/kie-editors-standalone": "^0.30.0",
+    "@kie-tools/kie-editors-standalone": "^0.32.0",
     "@patternfly/react-charts": "^6.94.19",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
diff --git a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualOutcomeUnsupported/CounterfactualOutcomeUnsupported.tsx b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualOutcomeUnsupported/CounterfactualOutcomeUnsupported.tsx
index f845548bd9..d41b7a629d 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualOutcomeUnsupported/CounterfactualOutcomeUnsupported.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualOutcomeUnsupported/CounterfactualOutcomeUnsupported.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { CFGoal } from '../../../types';
 import { FormGroup, Text, TextVariants } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/CounterfactualUnsupported.tsx b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/CounterfactualUnsupported.tsx
index b4065db258..38f607f974 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/CounterfactualUnsupported.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/CounterfactualUnsupported.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   EmptyState,
@@ -21,7 +39,7 @@ const CounterfactualUnsupported = (props: CounterfactualUnsupportedProps) => {
       <EmptyStateIcon icon={InfoCircleIcon} />
       <Title headingLevel="h1">Counterfactuals cannot be generated</Title>
       <EmptyStateBody>
-        {messages.map(message => (
+        {messages.map((message) => (
           <p key={message.id} data-ouia-component-id={`${message.id}`}>
             {message.message}
           </p>
diff --git a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/tests/CounterfactualUnsupported.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/tests/CounterfactualUnsupported.test.tsx
index 7cb7ed9654..3c1c5914ce 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/tests/CounterfactualUnsupported.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupported/tests/CounterfactualUnsupported.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import CounterfactualUnsupported from '../CounterfactualUnsupported';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupportedBanner/CounterfactualUnsupportedBanner.tsx b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupportedBanner/CounterfactualUnsupportedBanner.tsx
index a0a771421f..18d98a0a00 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupportedBanner/CounterfactualUnsupportedBanner.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/CounterfactualUnsupportedBanner/CounterfactualUnsupportedBanner.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import './CounterfactualUnsupportedBanner.scss';
 import { Alert } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/EvaluationStatus.tsx b/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/EvaluationStatus.tsx
index 9bb2aa8c0c..5f0b0e5d30 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/EvaluationStatus.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/EvaluationStatus.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { evaluationStatus, evaluationStatusStrings } from '../../../types';
 import {
diff --git a/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/tests/EvaluationStatus.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/tests/EvaluationStatus.test.tsx
index b714fe06db..3abc513f7c 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/tests/EvaluationStatus.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/EvaluationStatus/tests/EvaluationStatus.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import EvaluationStatus from '../EvaluationStatus';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/ExecutionId.tsx b/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/ExecutionId.tsx
index c1c665ffb8..58e91f3b5b 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/ExecutionId.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/ExecutionId.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useMemo } from 'react';
 import './ExecutionId.scss';
 
diff --git a/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/tests/ExecutionId.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/tests/ExecutionId.test.tsx
index fd80660816..c3c9f1ac14 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/tests/ExecutionId.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/ExecutionId/tests/ExecutionId.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import ExecutionId from '../ExecutionId';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/ExecutionStatus.tsx b/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/ExecutionStatus.tsx
index 17fabc3c25..36c8b0a519 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/ExecutionStatus.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/ExecutionStatus.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { CheckCircleIcon, ErrorCircleOIcon } from '@patternfly/react-icons';
 import './ExecutionStatus.scss';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/tests/ExecutionStatus.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/tests/ExecutionStatus.test.tsx
index b8cd6f751c..0f5cc6ea65 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/tests/ExecutionStatus.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/ExecutionStatus/tests/ExecutionStatus.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import ExecutionStatus from '../ExecutionStatus';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/FormattedDate.tsx b/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/FormattedDate.tsx
index 8fedb2e96f..0218883867 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/FormattedDate.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/FormattedDate.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { differenceInDays, format, formatDistanceToNow } from 'date-fns';
 import { Tooltip } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/tests/FormattedDate.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/tests/FormattedDate.test.tsx
index d8ed43aaef..20d0d3d961 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/tests/FormattedDate.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/FormattedDate/tests/FormattedDate.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import FormattedDate from '../FormattedDate';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/FormattedValue.tsx b/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/FormattedValue.tsx
index a86fb80f6e..52e920eeef 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/FormattedValue.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/FormattedValue.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { v4 as uuid } from 'uuid';
 import { Tooltip } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/tests/FormattedValue.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/tests/FormattedValue.test.tsx
index ebf344c4f6..b2803afbd8 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/tests/FormattedValue.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/FormattedValue/tests/FormattedValue.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import FormattedValue from '../FormattedValue';
 import { mount, shallow } from 'enzyme';
@@ -36,7 +54,9 @@ describe('Formatted Value', () => {
     const wrapper = mount(<FormattedValue value={valueList} />);
     expect(wrapper.find('.formatted-list')).toHaveLength(1);
     expect(
-      wrapper.find('.formatted-list .formatted-value').map(item => item.text())
+      wrapper
+        .find('.formatted-list .formatted-value')
+        .map((item) => item.text())
     ).toStrictEqual(valueList);
   });
 });
diff --git a/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/SkeletonStripe.tsx b/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/SkeletonStripe.tsx
index cca43dd069..feac63a95c 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/SkeletonStripe.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/SkeletonStripe.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useMemo } from 'react';
 import './SkeletonStripe.scss';
 
diff --git a/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/tests/SkeletonStripe.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/tests/SkeletonStripe.test.tsx
index 6687cc1e7e..02005e30e7 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/tests/SkeletonStripe.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/SkeletonStripe/tests/SkeletonStripe.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import SkeletonStripe from '../SkeletonStripe';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/TrustyLink.tsx b/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/TrustyLink.tsx
index f5c12ebd61..8274b3e4a7 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/TrustyLink.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/TrustyLink.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useContext } from 'react';
 import { Link, useHistory } from 'react-router-dom';
 import { TrustyContext } from '../../Templates/TrustyApp/TrustyApp';
diff --git a/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/tests/TrustyLink.test.tsx b/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/tests/TrustyLink.test.tsx
index 2d49c8aaac..5dc0db2fc4 100644
--- a/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/tests/TrustyLink.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Atoms/TrustyLink/tests/TrustyLink.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router';
@@ -52,10 +70,7 @@ describe('TrustyLink', () => {
     expect(wrapper.find('a').props().href).toBeUndefined();
     expect(wrapper.find('a').text()).toMatch(urlDescription);
 
-    wrapper
-      .find('a')
-      .at(0)
-      .simulate('click');
+    wrapper.find('a').at(0).simulate('click');
 
     expect(mockHistoryPush).toHaveBeenCalledTimes(1);
     expect(mockHistoryPush).toHaveBeenCalledWith(url);
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualCompletedMessage/CounterfactualCompletedMessage.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualCompletedMessage/CounterfactualCompletedMessage.tsx
index 7abc11609f..8ce2a96e0b 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualCompletedMessage/CounterfactualCompletedMessage.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualCompletedMessage/CounterfactualCompletedMessage.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useState } from 'react';
 import {
   Alert,
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualError/CounterfactualError.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualError/CounterfactualError.tsx
index 091f6f06bc..73b4f896e4 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualError/CounterfactualError.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualError/CounterfactualError.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useState } from 'react';
 import { Button, Modal } from '@patternfly/react-core';
 
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualExecutionInfo/CounterfactualExecutionInfo.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualExecutionInfo/CounterfactualExecutionInfo.tsx
index 870daa8df7..de1b85f50e 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualExecutionInfo/CounterfactualExecutionInfo.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualExecutionInfo/CounterfactualExecutionInfo.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useMemo, useState } from 'react';
 import { Badge, FlexItem } from '@patternfly/react-core';
 import { v4 as uuid } from 'uuid';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualInputDomain/CounterfactualInputDomain.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualInputDomain/CounterfactualInputDomain.tsx
index c34d33ae9a..a43b4d5a63 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualInputDomain/CounterfactualInputDomain.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualInputDomain/CounterfactualInputDomain.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { CFSearchInputUnit } from '../../../types';
 
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcome/CounterfactualOutcome.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcome/CounterfactualOutcome.tsx
index aa167c3f67..035e6236f6 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcome/CounterfactualOutcome.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcome/CounterfactualOutcome.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useMemo } from 'react';
 import { FormGroup, Text, TextVariants } from '@patternfly/react-core';
 import { CFGoal, CFGoalRole } from '../../../types';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/CounterfactualOutcomeEdit.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/CounterfactualOutcomeEdit.tsx
index d68c2b76b5..9440b55d69 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/CounterfactualOutcomeEdit.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/CounterfactualOutcomeEdit.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useMemo, useState } from 'react';
 import {
   Checkbox,
@@ -67,7 +85,7 @@ const CounterfactualOutcomeEdit = (props: CounterfactualOutcomeEditProps) => {
         id={goal.id}
         className="counterfactual-outcome__floating"
         isChecked={goal.role === CFGoalRole.FLOATING}
-        onChange={checked => {
+        onChange={(checked) => {
           let updatedRole = CFGoalRole.FIXED;
           if (goal.value === goal.originalValue) {
             updatedRole = CFGoalRole.ORIGINAL;
@@ -132,9 +150,10 @@ const CounterfactualOutcomeNumber = (props: CounterfactualOutcomeEditProps) => {
 
   const decimalPlaces = goal.value.value.toString().split('.')[1]?.length || 0;
 
-  const touchSpinWidth = useMemo(() => String(goal.value).length + 2, [
-    goal.value
-  ]);
+  const touchSpinWidth = useMemo(
+    () => String(goal.value).length + 2,
+    [goal.value]
+  );
 
   const onMinus = () => {
     if (isFloating(goal)) {
@@ -149,7 +168,7 @@ const CounterfactualOutcomeNumber = (props: CounterfactualOutcomeEditProps) => {
     });
   };
 
-  const onChange = event => {
+  const onChange = (event) => {
     if (isFloating(goal)) {
       return;
     }
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/tests/CounterfactualOutcomeEdit.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/tests/CounterfactualOutcomeEdit.test.tsx
index 47dd8a269b..3d505233a3 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/tests/CounterfactualOutcomeEdit.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualOutcomeEdit/tests/CounterfactualOutcomeEdit.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import { CFGoal, CFGoalRole } from '../../../../types';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/CounterfactualProgressBar.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/CounterfactualProgressBar.tsx
index b038cc8d64..e504ded5ab 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/CounterfactualProgressBar.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/CounterfactualProgressBar.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Progress, ProgressSize } from '@patternfly/react-core';
 
@@ -15,7 +33,7 @@ const CounterfactualProgressBar = (props: CounterfactualProgressBarProps) => {
   useEffect(() => {
     if (value === 0 && intervalID.current === null) {
       intervalID.current = window.setInterval(() => {
-        setValue(prev => prev + 1);
+        setValue((prev) => prev + 1);
       }, 1000);
     }
     if (value === timeLimit) {
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/tests/CounterfactualProgressBar.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/tests/CounterfactualProgressBar.test.tsx
index d9b8bfa9f6..9e0971a3db 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/tests/CounterfactualProgressBar.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualProgressBar/tests/CounterfactualProgressBar.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import CounterfactualProgressBar from '../CounterfactualProgressBar';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/CounterfactualOutcomesSelected.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/CounterfactualOutcomesSelected.tsx
index 3d5dc4330d..40e6948b02 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/CounterfactualOutcomesSelected.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/CounterfactualOutcomesSelected.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useMemo } from 'react';
 import { List, ListItem, ListVariant } from '@patternfly/react-core';
 import { CFGoal, CFGoalRole } from '../../../types';
@@ -12,7 +30,7 @@ const CounterfactualOutcomesSelected = ({
   const selectedOutcomes = useMemo(
     () =>
       goals.filter(
-        goal =>
+        (goal) =>
           goal.role === CFGoalRole.FIXED || goal.role === CFGoalRole.FLOATING
       ),
     [goals]
diff --git a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/tests/CounterfactualOutcomesSelected.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/tests/CounterfactualOutcomesSelected.test.tsx
index f5a88110bd..724d8516be 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/tests/CounterfactualOutcomesSelected.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/CounterfactualsOutcomesSelected/tests/CounterfactualOutcomesSelected.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import CounterfactualOutcomesSelected from '../CounterfactualOutcomesSelected';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/DatePicker/DatePicker.tsx b/ui-packages/packages/trusty/src/components/Molecules/DatePicker/DatePicker.tsx
index be76dd1a40..39d74bd9f5 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/DatePicker/DatePicker.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/DatePicker/DatePicker.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useRef } from 'react';
 import { InputGroup, TextInput } from '@patternfly/react-core';
 import flatpickr from 'flatpickr';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/DatePicker/tests/DatePicker.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/DatePicker/tests/DatePicker.test.tsx
index cd6815ad96..605a7fd8eb 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/DatePicker/tests/DatePicker.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/DatePicker/tests/DatePicker.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import DatePicker from '../DatePicker';
 import { mount } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/ExplanationError.tsx b/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/ExplanationError.tsx
index 7c50abf928..1fa69f75b3 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/ExplanationError.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/ExplanationError.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   Card,
diff --git a/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/tests/ExplanationError.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/tests/ExplanationError.test.tsx
index f034e97b3e..f5ccc4e04e 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/tests/ExplanationError.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/ExplanationError/tests/ExplanationError.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import ExplanationError from '../ExplanationError';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/ExplanationUnavailable.tsx b/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/ExplanationUnavailable.tsx
index 1556a868ef..4f9b2939f2 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/ExplanationUnavailable.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/ExplanationUnavailable.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   Card,
diff --git a/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/tests/ExplanationUnavailable.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/tests/ExplanationUnavailable.test.tsx
index d7e9c1a041..8f80777c7d 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/tests/ExplanationUnavailable.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/ExplanationUnavailable/tests/ExplanationUnavailable.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import ExplanationUnavailable from '../ExplanationUnavailable';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/SkeletonCards.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/SkeletonCards.tsx
index 4c88ec3e76..060b96fd18 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/SkeletonCards.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/SkeletonCards.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { Gallery, GalleryItem } from '@patternfly/react-core';
 import { v4 as uuid } from 'uuid';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/tests/SkeletonCards.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/tests/SkeletonCards.test.tsx
index 32a962047c..3a4c8fabbe 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/tests/SkeletonCards.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonCards/tests/SkeletonCards.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import SkeletonCards from '../SkeletonCards';
 import { shallow } from 'enzyme';
@@ -15,16 +33,10 @@ describe('SkeletonCards', () => {
     expect(wrapper.find('.skeleton-cards')).toHaveLength(1);
     expect(wrapper.find('.skeleton-cards__card')).toHaveLength(3);
     expect(
-      wrapper
-        .find('.skeleton-cards__card')
-        .at(0)
-        .find('SkeletonStripe')
+      wrapper.find('.skeleton-cards__card').at(0).find('SkeletonStripe')
     ).toHaveLength(2);
     expect(
-      wrapper
-        .find('.skeleton-cards__card')
-        .at(1)
-        .find('SkeletonStripe')
+      wrapper.find('.skeleton-cards__card').at(1).find('SkeletonStripe')
     ).toHaveLength(2);
   });
 });
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/SkeletonDataList.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/SkeletonDataList.tsx
index b4e35f75b4..7a0e68e0b5 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/SkeletonDataList.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/SkeletonDataList.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   DataList,
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/tests/SkeletonDataList.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/tests/SkeletonDataList.test.tsx
index 24c1267091..8adff53e9a 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/tests/SkeletonDataList.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDataList/tests/SkeletonDataList.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import SkeletonDataList from '../SkeletonDataList';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/SkeletonDoubleBarChart.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/SkeletonDoubleBarChart.tsx
index 247995238a..2991b2eb43 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/SkeletonDoubleBarChart.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/SkeletonDoubleBarChart.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { v4 as uuid } from 'uuid';
 import { Split, SplitItem } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/tests/SkeletonDoubleBarChart.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/tests/SkeletonDoubleBarChart.test.tsx
index 502451d287..fec0d7113d 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/tests/SkeletonDoubleBarChart.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonDoubleBarChart/tests/SkeletonDoubleBarChart.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import SkeletonDoubleBarChart from '../SkeletonDoubleBarChart';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/SkeletonFlexStripes.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/SkeletonFlexStripes.tsx
index 1456bc143d..74fbd2ae8d 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/SkeletonFlexStripes.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/SkeletonFlexStripes.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 import SkeletonStripe from '../../Atoms/SkeletonStripe/SkeletonStripe';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/tests/SkeletonFlexStripes.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/tests/SkeletonFlexStripes.test.tsx
index 225475abe3..cf7dcebc50 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/tests/SkeletonFlexStripes.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonFlexStripes/tests/SkeletonFlexStripes.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import SkeletonFlexStripes from '../SkeletonFlexStripes';
@@ -16,10 +34,7 @@ describe('SkeletonFlexStripes', () => {
     expect(wrapper.prop('className')).toMatch('skeleton__flex-stripes');
     expect(wrapper.find('SkeletonStripe')).toHaveLength(3);
     expect(
-      wrapper
-        .find('SkeletonStripe')
-        .at(0)
-        .prop('customStyle')
+      wrapper.find('SkeletonStripe').at(0).prop('customStyle')
     ).toStrictEqual({
       width: '200px',
       height: '1em'
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/SkeletonGrid.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/SkeletonGrid.tsx
index d070979027..167ab58214 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/SkeletonGrid.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/SkeletonGrid.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { Grid, GridItem, gridSpans } from '@patternfly/react-core';
 import SkeletonStripe from '../../Atoms/SkeletonStripe/SkeletonStripe';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/tests/SkeletonGrid.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/tests/SkeletonGrid.test.tsx
index d5dad4660b..330666e527 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/tests/SkeletonGrid.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonGrid/tests/SkeletonGrid.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import SkeletonGrid from '../SkeletonGrid';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/SkeletonTornadoChart.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/SkeletonTornadoChart.tsx
index f9f47107c6..da199c57ba 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/SkeletonTornadoChart.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/SkeletonTornadoChart.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { v4 as uuid } from 'uuid';
 import SkeletonStripe from '../../Atoms/SkeletonStripe/SkeletonStripe';
diff --git a/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/tests/SkeletonTornadoChart.test.tsx b/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/tests/SkeletonTornadoChart.test.tsx
index 8d4ec28f9f..180d923002 100644
--- a/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/tests/SkeletonTornadoChart.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Molecules/SkeletonTornadoChart/tests/SkeletonTornadoChart.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import SkeletonTornadoChart from '../SkeletonTornadoChart';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/AuditToolbar.tsx b/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/AuditToolbar.tsx
index 98b1e7826b..005e689b9b 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/AuditToolbar.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/AuditToolbar.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useRef } from 'react';
 import {
   Button,
diff --git a/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarBottom.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarBottom.test.tsx
index 7caeb7fac2..b95df8ad1c 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarBottom.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarBottom.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { AuditToolbarBottom } from '../AuditToolbar';
 import { mount, shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarTop.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarTop.test.tsx
index 85a3f44a07..984c75745c 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarTop.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/AuditToolbar/tests/AuditToolbarTop.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { AuditToolbarTop } from '../AuditToolbar';
 import { mount, shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/Breadcrumbs.tsx b/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/Breadcrumbs.tsx
index d8e8562fae..e7c9793908 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/Breadcrumbs.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/Breadcrumbs.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import useBreadcrumbs from 'use-react-router-breadcrumbs';
 import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/tests/Breadcrumbs.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/tests/Breadcrumbs.test.tsx
index 661cd94664..271fda69bd 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/tests/Breadcrumbs.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/Breadcrumbs/tests/Breadcrumbs.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import Breadcrumbs from '../Breadcrumbs';
 import { mount } from 'enzyme';
@@ -45,41 +63,23 @@ describe('Breadcrumbs', () => {
 
     expect(breadcrumbs).toMatchSnapshot();
     expect(breadcrumbs.find('li.breadcrumb-item')).toHaveLength(3);
+    expect(breadcrumbs.find('li.breadcrumb-item').at(0).text()).toMatch(
+      'Audit investigation'
+    );
+    expect(breadcrumbs.find('li.breadcrumb-item').at(1).text()).toMatch(
+      `Execution #${executionId.substring(0, 8)}`
+    );
+    expect(breadcrumbs.find('li.breadcrumb-item').at(2).text()).toMatch(
+      'Outcomes'
+    );
     expect(
-      breadcrumbs
-        .find('li.breadcrumb-item')
-        .at(0)
-        .text()
-    ).toMatch('Audit investigation');
-    expect(
-      breadcrumbs
-        .find('li.breadcrumb-item')
-        .at(1)
-        .text()
-    ).toMatch(`Execution #${executionId.substring(0, 8)}`);
-    expect(
-      breadcrumbs
-        .find('li.breadcrumb-item')
-        .at(2)
-        .text()
-    ).toMatch('Outcomes');
-    expect(
-      breadcrumbs
-        .find('BreadcrumbItem')
-        .at(0)
-        .prop('isActive') as boolean
+      breadcrumbs.find('BreadcrumbItem').at(0).prop('isActive') as boolean
     ).toBeFalsy();
     expect(
-      breadcrumbs
-        .find('BreadcrumbItem')
-        .at(1)
-        .prop('isActive') as boolean
+      breadcrumbs.find('BreadcrumbItem').at(1).prop('isActive') as boolean
     ).toBeFalsy();
     expect(
-      breadcrumbs
-        .find('BreadcrumbItem')
-        .at(2)
-        .prop('isActive') as boolean
+      breadcrumbs.find('BreadcrumbItem').at(2).prop('isActive') as boolean
     ).toBeTruthy();
   });
 });
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/CounterfactualAnalysis.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/CounterfactualAnalysis.tsx
index 54c79d2cce..558f868660 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/CounterfactualAnalysis.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/CounterfactualAnalysis.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useMemo, useReducer, useState } from 'react';
 import {
   Drawer,
@@ -51,13 +69,8 @@ type CounterfactualAnalysisProps = {
 };
 
 const CounterfactualAnalysis = (props: CounterfactualAnalysisProps) => {
-  const {
-    executionId,
-    inputs,
-    outcomes,
-    containerWidth,
-    containerHeight
-  } = props;
+  const { executionId, inputs, outcomes, containerWidth, containerHeight } =
+    props;
   const [state, dispatch] = useReducer(
     cfReducer,
     { inputs, outcomes },
@@ -69,9 +82,8 @@ const CounterfactualAnalysis = (props: CounterfactualAnalysisProps) => {
     inputIndex: number;
   }>();
 
-  const { runCFAnalysis, cfAnalysis, cfResults } = useCounterfactualExecution(
-    executionId
-  );
+  const { runCFAnalysis, cfAnalysis, cfResults } =
+    useCounterfactualExecution(executionId);
 
   const handleInputDomainEdit = (input: CFSearchInput, inputIndex: number) => {
     setInputDomainEdit({ input, inputIndex });
@@ -94,7 +106,7 @@ const CounterfactualAnalysis = (props: CounterfactualAnalysisProps) => {
   useEffect(() => {
     if (cfResults) {
       const succeededResults = cfResults.solutions.filter(
-        result => result.status !== 'FAILED' && result.isValid
+        (result) => result.status !== 'FAILED' && result.isValid
       );
       if (succeededResults.length) {
         dispatch({
@@ -105,7 +117,7 @@ const CounterfactualAnalysis = (props: CounterfactualAnalysisProps) => {
         });
       }
       const finalResult = cfResults.solutions.find(
-        result => result.stage === 'FINAL'
+        (result) => result.stage === 'FINAL'
       );
       if (finalResult !== undefined) {
         let executionStatus;
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/CounterfactualAnalysis.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/CounterfactualAnalysis.test.tsx
index 8be019a598..ef4b9699a2 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/CounterfactualAnalysis.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/CounterfactualAnalysis.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { FormEvent } from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/__mocks__/tabbable.js b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/__mocks__/tabbable.js
index d86d325edc..02d3358598 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/__mocks__/tabbable.js
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/__mocks__/tabbable.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const lib = jest.requireActual('tabbable');
 
 const tabbable = {
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/useCounterfactualExecution.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/useCounterfactualExecution.test.tsx
index 1993a63a20..5e6a4ee863 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/useCounterfactualExecution.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/tests/useCounterfactualExecution.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import { act } from 'react-test-renderer';
 import * as api from '../../../../utils/api/httpClient';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/useCounterfactualExecution.ts b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/useCounterfactualExecution.ts
index c56b800384..404d02117a 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/useCounterfactualExecution.ts
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualAnalysis/useCounterfactualExecution.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { useCallback, useContext, useEffect, useRef, useState } from 'react';
 import { EXECUTIONS_PATH, httpClient } from '../../../utils/api/httpClient';
 import {
@@ -32,7 +50,7 @@ const useCounterfactualExecution = (executionId: string) => {
 
       const partialGoals = goals
         .filter(
-          goal =>
+          (goal) =>
             goal.role === CFGoalRole.FIXED || goal.role === CFGoalRole.ORIGINAL
         )
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -49,7 +67,7 @@ const useCounterfactualExecution = (executionId: string) => {
       };
 
       httpClient(config)
-        .then(response => {
+        .then((response) => {
           if (isMounted) {
             setCFAnalysis({
               status: RemoteDataStatus.SUCCESS,
@@ -58,7 +76,7 @@ const useCounterfactualExecution = (executionId: string) => {
             setCounterfactualId(response.data.counterfactualId);
           }
         })
-        .catch(error => {
+        .catch((error) => {
           setCFAnalysis({ status: RemoteDataStatus.FAILURE, error });
         });
       return () => {
@@ -78,12 +96,12 @@ const useCounterfactualExecution = (executionId: string) => {
     };
 
     httpClient(config)
-      .then(response => {
+      .then((response) => {
         if (isMounted) {
           setCFResults(response.data);
         }
       })
-      .catch(error => {
+      .catch((error) => {
         setCFAnalysis({ status: RemoteDataStatus.FAILURE, error });
       });
     return () => {
@@ -104,7 +122,7 @@ const useCounterfactualExecution = (executionId: string) => {
   useEffect(() => {
     if (cfResults) {
       const finalResult = cfResults.solutions.find(
-        solution => solution.stage === 'FINAL'
+        (solution) => solution.stage === 'FINAL'
       );
       if (finalResult) {
         setResultsPolling(null);
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/CounterfactualInputDomainEdit.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/CounterfactualInputDomainEdit.tsx
index efbfe46fbf..3a9f115f12 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/CounterfactualInputDomainEdit.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/CounterfactualInputDomainEdit.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useContext, useMemo, useState } from 'react';
 import {
   ActionList,
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/tests/CounterfactualInputDomainEdit.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/tests/CounterfactualInputDomainEdit.test.tsx
index 49e28e6746..737c273338 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/tests/CounterfactualInputDomainEdit.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualInputDomainEdit/tests/CounterfactualInputDomainEdit.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import CounterfactualInputDomainEdit from '../CounterfactualInputDomainEdit';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualNumericalDomainEdit/CounterfactualNumericalDomainEdit.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualNumericalDomainEdit/CounterfactualNumericalDomainEdit.tsx
index 30ffdf1e5b..44567de80b 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualNumericalDomainEdit/CounterfactualNumericalDomainEdit.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualNumericalDomainEdit/CounterfactualNumericalDomainEdit.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useState } from 'react';
 import {
   Alert,
@@ -27,11 +45,11 @@ const CounterfactualNumericalDomainEdit = (
     inputDomain ? inputDomain.upperBound : undefined
   );
 
-  const handleMinChange = value => {
+  const handleMinChange = (value) => {
     onUpdate(value === '' ? undefined : Number(value), max);
   };
 
-  const handleMaxChange = value => {
+  const handleMaxChange = (value) => {
     onUpdate(min, value === '' ? undefined : Number(value));
   };
 
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/CounterfactualOutcomeSelection.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/CounterfactualOutcomeSelection.tsx
index 178fad0fa4..e1d07e6b4a 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/CounterfactualOutcomeSelection.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/CounterfactualOutcomeSelection.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useCallback, useContext, useState } from 'react';
 import {
   Alert,
@@ -31,20 +49,20 @@ const CounterfactualOutcomeSelection = (
 
   const isDesiredOutcomeDefined = useCallback(
     () =>
-      editingGoals.filter(goal => goal.role === CFGoalRole.FIXED).length > 0,
+      editingGoals.filter((goal) => goal.role === CFGoalRole.FIXED).length > 0,
     [editingGoals]
   );
 
   const areAllDesiredOutcomeFloating = useCallback(
     () =>
       editingGoals
-        .filter(goal => goal.role !== CFGoalRole.UNSUPPORTED)
-        .every(goal => goal.role === CFGoalRole.FLOATING),
+        .filter((goal) => goal.role !== CFGoalRole.UNSUPPORTED)
+        .every((goal) => goal.role === CFGoalRole.FLOATING),
     [editingGoals]
   );
 
   const updateGoal = (updatedGoal: CFGoal) => {
-    const updatedGoals = editingGoals.map(goal => {
+    const updatedGoals = editingGoals.map((goal) => {
       if (goal.id !== updatedGoal.id) {
         return goal;
       }
@@ -68,7 +86,7 @@ const CounterfactualOutcomeSelection = (
 
   const handleApply = () => {
     // removing checked goals with no changed values
-    const cleanedGoals = editingGoals.map(goal => {
+    const cleanedGoals = editingGoals.map((goal) => {
       if (goal.role === CFGoalRole.UNSUPPORTED) {
         return goal;
       }
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/tests/CounterfactualOutcomeSelection.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/tests/CounterfactualOutcomeSelection.test.tsx
index 7db5e05880..9d983bce88 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/tests/CounterfactualOutcomeSelection.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualOutcomeSelection/tests/CounterfactualOutcomeSelection.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { CFGoal, CFGoalRole } from '../../../../types';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/CounterfactualTable.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/CounterfactualTable.tsx
index db82fa4de8..303ae42ddf 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/CounterfactualTable.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/CounterfactualTable.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, {
   useCallback,
   useContext,
@@ -47,13 +65,8 @@ type CounterfactualTableProps = {
 };
 
 const CounterfactualTable = (props: CounterfactualTableProps) => {
-  const {
-    inputs,
-    results,
-    status,
-    onOpenInputDomainEdit,
-    containerWidth
-  } = props;
+  const { inputs, results, status, onOpenInputDomainEdit, containerWidth } =
+    props;
   const dispatch = useContext(CFDispatch);
   const columns = [
     'Input',
@@ -70,9 +83,8 @@ const CounterfactualTable = (props: CounterfactualTableProps) => {
   const [displayedResults, setDisplayedResults] = useState(
     convertCFResultsInputs(results)
   );
-  const [isInputSelectionEnabled, setIsInputSelectionEnabled] = useState<
-    boolean
-  >();
+  const [isInputSelectionEnabled, setIsInputSelectionEnabled] =
+    useState<boolean>();
   const [newResults, setNewResults] = useState<string[]>([]);
 
   const scrollbars = useRef(null);
@@ -170,8 +182,8 @@ const CounterfactualTable = (props: CounterfactualTableProps) => {
 
   useEffect(() => {
     if (results.length > 0) {
-      const ids = results.map(item => item.solutionId);
-      const firstNewIndex = ids.findIndex(x => newResults.includes(x));
+      const ids = results.map((item) => item.solutionId);
+      const firstNewIndex = ids.findIndex((x) => newResults.includes(x));
       const newItems = firstNewIndex > -1 ? ids.slice(0, firstNewIndex) : ids;
       if (newItems.length > 0 && newItems.join() !== newResults.join()) {
         setNewResults(newItems);
@@ -183,8 +195,8 @@ const CounterfactualTable = (props: CounterfactualTableProps) => {
     setRows(inputs);
     setAreAllRowsSelected(
       inputs
-        .filter(input => input.value.kind === 'UNIT')
-        .find(input => (input.value as CFSearchInputUnit).fixed) === undefined
+        .filter((input) => input.value.kind === 'UNIT')
+        .find((input) => (input.value as CFSearchInputUnit).fixed) === undefined
     );
   }, [inputs]);
 
@@ -284,7 +296,7 @@ const CounterfactualTable = (props: CounterfactualTableProps) => {
                           </Th>
                         )}
                         {displayedResults.length > 0 &&
-                          displayedResults[0].map(result => (
+                          displayedResults[0].map((result) => (
                             <Th
                               key={`result ${result.value}`}
                               className={
@@ -345,7 +357,7 @@ const CounterfactualTable = (props: CounterfactualTableProps) => {
                           <Td key="id-row_3" />
                           <Td key="id-row_4" />
                           {displayedResults.length > 0 &&
-                            displayedResults[0].map(result => (
+                            displayedResults[0].map((result) => (
                               <Td
                                 key={`id-row_${result.value}`}
                                 dataLabel={'Counterfactual Result'}
@@ -558,7 +570,7 @@ const convertCFResultsInputs = (results: CFAnalysisResult[]) => {
   const rows = [];
   if (results.length) {
     rows.push([]);
-    results.forEach(result => {
+    results.forEach((result) => {
       rows[0].push({ value: result.solutionId, stage: result.stage });
       result.inputs.forEach((input, inputIndex) => {
         if (!rows[inputIndex + 1]) {
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/tests/CounterfactualTable.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/tests/CounterfactualTable.test.tsx
index 9abd44ff7c..eaf7aebe1c 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/tests/CounterfactualTable.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualTable/tests/CounterfactualTable.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import CounterfactualTable from '../CounterfactualTable';
@@ -30,34 +48,18 @@ describe('CounterfactualTable', () => {
     expect(rows).toHaveLength(4);
 
     for (let i = 0; i < inputs.length; i++) {
-      expect(
-        rows
-          .at(i)
-          .find('[data-label="Input"]')
-          .text()
-      ).toMatch(inputs[i].name);
-      expect(
-        rows
-          .at(i)
-          .find('[data-label="Input Value"]')
-          .text()
-      ).toMatch(
+      expect(rows.at(i).find('[data-label="Input"]').text()).toMatch(
+        inputs[i].name
+      );
+      expect(rows.at(i).find('[data-label="Input Value"]').text()).toMatch(
         (inputs[i].value as CFSearchInputUnit).originalValue.value.toString()
       );
       expect(
-        rows
-          .at(i)
-          .find('[data-label="Counterfactual Result"]')
-          .text()
+        rows.at(i).find('[data-label="Counterfactual Result"]').text()
       ).toMatch('No available results');
     }
 
-    expect(
-      rows
-        .at(0)
-        .find('[data-label="Constraint"]')
-        .text()
-    ).toMatch('');
+    expect(rows.at(0).find('[data-label="Constraint"]').text()).toMatch('');
     expect(
       rows.at(0).find('button.counterfactual-constraint-edit')
     ).toHaveLength(0);
@@ -70,12 +72,9 @@ describe('CounterfactualTable', () => {
     expect(
       rows.at(3).find('button.counterfactual-constraint-edit')
     ).toHaveLength(0);
-    expect(
-      rows
-        .at(3)
-        .find('[data-label="Constraint"]')
-        .text()
-    ).toMatch('Not yet supported');
+    expect(rows.at(3).find('[data-label="Constraint"]').text()).toMatch(
+      'Not yet supported'
+    );
   });
 
   it('renders the table with CF results', () => {
@@ -99,11 +98,7 @@ describe('CounterfactualTable', () => {
 
     for (let i = 0; i < results.length; i++) {
       expect(
-        rows
-          .at(0)
-          .find('[data-label="Counterfactual Result"]')
-          .at(i)
-          .text()
+        rows.at(0).find('[data-label="Counterfactual Result"]').at(i).text()
       ).toMatch(`ID #${results[i].solutionId}`);
     }
 
@@ -115,11 +110,7 @@ describe('CounterfactualTable', () => {
     for (let i = 1; i <= inputsWithSelection.length; i++) {
       for (let j = 0; j < results.length; j++) {
         expect(
-          rows
-            .at(i)
-            .find('[data-label="Counterfactual Result"]')
-            .at(j)
-            .text()
+          rows.at(i).find('[data-label="Counterfactual Result"]').at(j).text()
         ).toMatch(results[j].inputs[i - 1].value.value.toString());
       }
     }
diff --git a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualToolbar/CounterfactualToolbar.tsx b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualToolbar/CounterfactualToolbar.tsx
index ad90a5a56d..222a100995 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/CounterfactualToolbar/CounterfactualToolbar.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/CounterfactualToolbar/CounterfactualToolbar.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useContext, useState } from 'react';
 import {
   Button,
@@ -38,9 +56,8 @@ const CounterfactualToolbar = (props: CounterfactualToolbarProps) => {
   } = props;
   const [isOutcomeSelectionOpen, setIsOutcomeSelectionOpen] = useState(false);
   const [CFResetType, setCFResetType] = useState<CFAnalysisResetType>();
-  const [isConfirmNewCFDialogOpen, setIsConfirmNewCFDialogOpen] = useState(
-    false
-  );
+  const [isConfirmNewCFDialogOpen, setIsConfirmNewCFDialogOpen] =
+    useState(false);
   const dispatch = useContext(CFDispatch);
 
   const toggleOutcomeSelection = () => {
diff --git a/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/ExecutionHeader.tsx b/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/ExecutionHeader.tsx
index ad638b1c79..0c1e0f4618 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/ExecutionHeader.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/ExecutionHeader.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { Flex, FlexItem, Title, Tooltip } from '@patternfly/react-core';
 import SkeletonStripe from '../../Atoms/SkeletonStripe/SkeletonStripe';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/tests/ExecutionHeader.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/tests/ExecutionHeader.test.tsx
index 3bdd047b3b..eb87b21230 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/tests/ExecutionHeader.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/ExecutionHeader/tests/ExecutionHeader.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import ExecutionHeader from '../ExecutionHeader';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/ExecutionTable.tsx b/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/ExecutionTable.tsx
index 6593328278..6c95619d1c 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/ExecutionTable.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/ExecutionTable.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useState } from 'react';
 import { useRouteMatch } from 'react-router-dom';
 import {
@@ -31,7 +49,7 @@ type ExecutionTableProps = {
   data: RemoteData<Error, Executions>;
 };
 
-const ExecutionTable: React.FC<ExecutionTableProps> = props => {
+const ExecutionTable: React.FC<ExecutionTableProps> = (props) => {
   const { data } = props;
   const columns = ['ID', 'Description', 'Executor', 'Date', 'Execution status'];
   const { url } = useRouteMatch();
@@ -95,7 +113,7 @@ const prepareRows = (
 };
 
 const prepareExecutionsRows = (rowData: Execution[], url: string) => {
-  return rowData.map(item => ({
+  return rowData.map((item) => ({
     executionKey: 'key-' + item.executionId,
     ouiaId: item.executionId,
     cells: [
diff --git a/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/tests/ExecutionTable.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/tests/ExecutionTable.test.tsx
index 737e6edfbc..74ce5213a4 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/tests/ExecutionTable.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/ExecutionTable/tests/ExecutionTable.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import ExecutionTable from '../ExecutionTable';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/Explanation/Explanation.tsx b/ui-packages/packages/trusty/src/components/Organisms/Explanation/Explanation.tsx
index e736c33ceb..9996842c4d 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/Explanation/Explanation.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/Explanation/Explanation.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useState } from 'react';
 import { RemoteDataStatus, SaliencyStatus } from '../../../types';
 import {
diff --git a/ui-packages/packages/trusty/src/components/Organisms/Explanation/tests/Explanation.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/Explanation/tests/Explanation.test.tsx
index 514580b0ba..7e56411e05 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/Explanation/tests/Explanation.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/Explanation/tests/Explanation.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import { orderBy } from 'lodash';
@@ -41,7 +59,7 @@ describe('Explanation', () => {
     if (saliencies.status === RemoteDataStatus.SUCCESS) {
       sortedFeatures = orderBy(
         saliencies.data.saliencies[0].featureImportance,
-        item => Math.abs(item.featureScore),
+        (item) => Math.abs(item.featureScore),
         'asc'
       );
     }
@@ -67,9 +85,11 @@ describe('Explanation', () => {
     );
 
     expect(
-      (wrapper
-        .find('FeaturesScoreChartBySign')
-        .prop('featuresScore') as Saliencies[]).length
+      (
+        wrapper
+          .find('FeaturesScoreChartBySign')
+          .prop('featuresScore') as Saliencies[]
+      ).length
     ).toBe(10);
 
     expect(
@@ -84,9 +104,11 @@ describe('Explanation', () => {
       wrapper.find('Modal FeaturesScoreChartBySign').prop('large')
     ).toBeTruthy();
     expect(
-      (wrapper
-        .find('Modal FeaturesScoreChartBySign')
-        .prop('featuresScore') as Saliencies[]).length
+      (
+        wrapper
+          .find('Modal FeaturesScoreChartBySign')
+          .prop('featuresScore') as Saliencies[]
+      ).length
     ).toBe(
       manySaliencies.status === RemoteDataStatus.SUCCESS &&
         manySaliencies.data.saliencies[0].featureImportance.length
diff --git a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/FeaturesScoreChart.tsx b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/FeaturesScoreChart.tsx
index 2225e9f314..a93e3e6a74 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/FeaturesScoreChart.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/FeaturesScoreChart.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useCallback, useMemo } from 'react';
 import {
   Chart,
@@ -25,7 +43,7 @@ const FeaturesScoreChart = (props: FeaturesScoreChartProps) => {
   const height = large ? 50 * featuresScore.length : 500;
 
   const maxValue = useMemo(() => {
-    const max = maxBy(featuresScore, item => {
+    const max = maxBy(featuresScore, (item) => {
       return Math.abs(item.featureScore);
     });
     return max ? max.featureScore : 1;
@@ -33,14 +51,14 @@ const FeaturesScoreChart = (props: FeaturesScoreChartProps) => {
 
   const labels = useMemo(() => {
     const labelList: string[] = [];
-    featuresScore.forEach(item => {
+    featuresScore.forEach((item) => {
       labelList.push(formattedScore(item.featureScore));
     });
     return labelList;
   }, [featuresScore]);
 
   const computeOpacity = useCallback(
-    data => {
+    (data) => {
       const computedOpacity = Math.abs(
         Math.floor((data.datum.featureScore / maxValue) * 100) / 100
       );
@@ -49,7 +67,7 @@ const FeaturesScoreChart = (props: FeaturesScoreChartProps) => {
     [maxValue]
   );
 
-  const computeColor = useCallback(data => {
+  const computeColor = useCallback((data) => {
     return data.datum.featureScore >= 0
       ? 'var(--pf-global--info-color--100)'
       : 'var(--pf-global--palette--orange-300)';
@@ -83,7 +101,7 @@ const FeaturesScoreChart = (props: FeaturesScoreChartProps) => {
           {
             target: 'data',
             eventHandlers: {
-              onMouseOver: event => {
+              onMouseOver: (event) => {
                 const { x, y } = Selection.getSVGEventCoordinates(event);
                 return [
                   {
@@ -96,7 +114,7 @@ const FeaturesScoreChart = (props: FeaturesScoreChartProps) => {
                   }
                 ];
               },
-              onMouseMove: event => {
+              onMouseMove: (event) => {
                 const { x, y } = Selection.getSVGEventCoordinates(event);
                 return [
                   {
@@ -109,7 +127,7 @@ const FeaturesScoreChart = (props: FeaturesScoreChartProps) => {
                   }
                 ];
               },
-              onTouchMove: event => {
+              onTouchMove: (event) => {
                 const { x, y } = Selection.getSVGEventCoordinates(event);
                 return [
                   {
@@ -122,7 +140,7 @@ const FeaturesScoreChart = (props: FeaturesScoreChartProps) => {
                   }
                 ];
               },
-              onTouchStart: event => {
+              onTouchStart: (event) => {
                 const { x, y } = Selection.getSVGEventCoordinates(event);
                 return [
                   {
@@ -215,7 +233,7 @@ const CustomLabel = (props: ChartTooltipProps) => {
   return (
     <ChartTooltip
       {...props}
-      text={data => {
+      text={(data) => {
         return data.datum.featureName + '\n' + data.datum.featureScore;
       }}
       pointerWidth={10}
diff --git a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/tests/FeatureScoreChart.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/tests/FeatureScoreChart.test.tsx
index f8d1e043f5..82de3b69f6 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/tests/FeatureScoreChart.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChart/tests/FeatureScoreChart.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import FeaturesScoreChart from '../FeaturesScoreChart';
 import { shallow } from 'enzyme';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/FeaturesScoreChartBySign.tsx b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/FeaturesScoreChartBySign.tsx
index cb0ec3d91b..61045fb11e 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/FeaturesScoreChartBySign.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/FeaturesScoreChartBySign.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useCallback, useMemo } from 'react';
 import { FeatureScores } from '../../../types';
 import { maxBy } from 'lodash';
@@ -25,10 +43,10 @@ const FeaturesScoreChartBySign = (props: FeaturesScoreChartBySignProps) => {
 
   const scores = useMemo(() => {
     const positives = featuresScore
-      .filter(feature => feature.featureScore > 0)
+      .filter((feature) => feature.featureScore > 0)
       .sort((a, b) => b.featureScore - a.featureScore);
     const negatives = featuresScore
-      .filter(feature => feature.featureScore < 0)
+      .filter((feature) => feature.featureScore < 0)
       .sort((a, b) => a.featureScore - b.featureScore);
     const maxNumberOfValues = Math.max(positives.length, negatives.length);
     const barWidth = (height - 90) / maxNumberOfValues / 2;
@@ -36,7 +54,7 @@ const FeaturesScoreChartBySign = (props: FeaturesScoreChartBySignProps) => {
   }, [featuresScore, height]);
 
   const maxValue = useMemo(() => {
-    const max = maxBy(featuresScore, item => {
+    const max = maxBy(featuresScore, (item) => {
       return Math.abs(item.featureScore);
     });
     return max ? Math.abs(max.featureScore) : 1;
@@ -110,7 +128,7 @@ const ScoresBarChart = (props: ScoresBarChartProps) => {
   } = props;
 
   const computeOpacity = useCallback(
-    data => {
+    (data) => {
       const computedOpacity = Math.abs(
         Math.floor((data.datum.featureScore / maxValue) * 100) / 100
       );
@@ -119,7 +137,7 @@ const ScoresBarChart = (props: ScoresBarChartProps) => {
     [maxValue]
   );
 
-  const computeColor = useCallback(data => {
+  const computeColor = useCallback((data) => {
     return data.datum.featureScore >= 0
       ? 'var(--pf-global--info-color--100)'
       : 'var(--pf-global--palette--orange-300)';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/tests/FeaturesScoreChartBySign.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/tests/FeaturesScoreChartBySign.test.tsx
index 42171c7924..5f01fd2cfe 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/tests/FeaturesScoreChartBySign.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreChartBySign/tests/FeaturesScoreChartBySign.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import FeaturesScoreChartBySign from '../FeaturesScoreChartBySign';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/FeaturesScoreTable.tsx b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/FeaturesScoreTable.tsx
index 5cae16a50f..b344b5dc1a 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/FeaturesScoreTable.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/FeaturesScoreTable.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   DataList,
@@ -20,10 +38,10 @@ type FeatureScoreTableProps = {
 const FeaturesScoreTable = (props: FeatureScoreTableProps) => {
   const { featuresScore } = props;
   const positiveScores = featuresScore
-    .filter(item => item.featureScore >= 0)
+    .filter((item) => item.featureScore >= 0)
     .reverse();
   const negativeScores = featuresScore
-    .filter(item => item.featureScore < 0)
+    .filter((item) => item.featureScore < 0)
     .reverse();
 
   return (
@@ -71,7 +89,7 @@ const ScoreTable = (props: ScoreTableProps) => {
           />
         </DataListItemRow>
       </DataListItem>
-      {featuresScore.map(item => (
+      {featuresScore.map((item) => (
         <DataListItem
           key={item.featureName}
           aria-labelledby={`feature-${item.featureName.replace(' ', '-')}`}
diff --git a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/tests/FeaturesScoreTable.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/tests/FeaturesScoreTable.test.tsx
index 269263f2a5..caa068b574 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/tests/FeaturesScoreTable.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/FeaturesScoreTable/tests/FeaturesScoreTable.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import FeaturesScoreTable from '../FeaturesScoreTable';
 import { mount, shallow } from 'enzyme';
@@ -12,18 +30,8 @@ describe('FeaturesScoreTable', () => {
     const wrapper = mount(<FeaturesScoreTable featuresScore={scores} />);
 
     expect(wrapper.find('DataList')).toHaveLength(2);
-    expect(
-      wrapper
-        .find('DataList')
-        .at(0)
-        .find('DataListItem')
-    ).toHaveLength(4);
-    expect(
-      wrapper
-        .find('DataList')
-        .at(1)
-        .find('DataListItem')
-    ).toHaveLength(3);
+    expect(wrapper.find('DataList').at(0).find('DataListItem')).toHaveLength(4);
+    expect(wrapper.find('DataList').at(1).find('DataListItem')).toHaveLength(3);
   });
 });
 
diff --git a/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/InputDataBrowser.tsx b/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/InputDataBrowser.tsx
index f88c9bc502..9c3190e795 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/InputDataBrowser.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/InputDataBrowser.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useState } from 'react';
 import {
   Button,
@@ -282,7 +300,7 @@ const renderItem = (
           renderedItems.push(renderItem(key, value, key));
         });
       } else if (value.kind === 'COLLECTION') {
-        value.value.forEach(value => {
+        value.value.forEach((value) => {
           renderedItems.push(
             <ItemsSubList
               name={name}
diff --git a/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/tests/InputDataBrowser.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/tests/InputDataBrowser.test.tsx
index 3169e7bf83..80ec739725 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/tests/InputDataBrowser.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/InputDataBrowser/tests/InputDataBrowser.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import InputDataBrowser from '../InputDataBrowser';
 import { mount, shallow } from 'enzyme';
@@ -61,16 +79,10 @@ describe('InputDataBrowser', () => {
     expect(wrapper.find('.input-browser__section-list')).toHaveLength(1);
     expect(wrapper.find('.input-browser__section-list button')).toHaveLength(2);
     expect(
-      wrapper
-        .find('.input-browser__section-list button')
-        .at(0)
-        .text()
+      wrapper.find('.input-browser__section-list button').at(0).text()
     ).toMatch('Root');
     expect(
-      wrapper
-        .find('.input-browser__section-list button')
-        .at(1)
-        .text()
+      wrapper.find('.input-browser__section-list button').at(1).text()
     ).toMatch('Property');
     expect(dataList).toHaveLength(1);
     expect(dataList.find('DataListItem.input-browser__header')).toHaveLength(1);
@@ -78,22 +90,15 @@ describe('InputDataBrowser', () => {
     expect(dataList.find('CategoryLine').prop('categoryLabel')).toMatch('Root');
     expect(dataList.find('InputValue')).toHaveLength(2);
     expect(
-      (dataList
-        .find('InputValue')
-        .at(0)
-        .prop('inputValue') as ItemObjectUnit).value
+      (dataList.find('InputValue').at(0).prop('inputValue') as ItemObjectUnit)
+        .value
     ).toBe(738);
     expect(
-      (dataList
-        .find('InputValue')
-        .at(1)
-        .prop('inputValue') as ItemObjectUnit).value
+      (dataList.find('InputValue').at(1).prop('inputValue') as ItemObjectUnit)
+        .value
     ).toBe(700);
 
-    wrapper
-      .find('.input-browser__section-list button')
-      .at(1)
-      .simulate('click');
+    wrapper.find('.input-browser__section-list button').at(1).simulate('click');
     const propertyDataList = wrapper.find('DataList.input-browser__data-list');
 
     expect(
diff --git a/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/ModelDiagram.tsx b/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/ModelDiagram.tsx
index 2f7586d7d1..3389f2cc4e 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/ModelDiagram.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/ModelDiagram.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect } from 'react';
 import { ModelData } from '../../../types';
 import { StandaloneEditorApi } from '@kie-tools/kie-editors-standalone/dist/common/Editor';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/tests/ModelDiagram.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/tests/ModelDiagram.test.tsx
index 1ac5722d50..307c613946 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/tests/ModelDiagram.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/ModelDiagram/tests/ModelDiagram.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import ModelDiagram from '../ModelDiagram';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/OutcomeSwitch.tsx b/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/OutcomeSwitch.tsx
index f4bec238db..1de46a4e91 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/OutcomeSwitch.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/OutcomeSwitch.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useState } from 'react';
 import {
   Select,
diff --git a/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/tests/OutcomeSwitch.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/tests/OutcomeSwitch.test.tsx
index 3a0127b723..5faa1ae69d 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/tests/OutcomeSwitch.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/OutcomeSwitch/tests/OutcomeSwitch.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { Outcome } from '../../../../types';
diff --git a/ui-packages/packages/trusty/src/components/Organisms/Outcomes/Outcomes.tsx b/ui-packages/packages/trusty/src/components/Organisms/Outcomes/Outcomes.tsx
index 4a6ce31743..fb41739ae4 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/Outcomes/Outcomes.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/Outcomes/Outcomes.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   Button,
diff --git a/ui-packages/packages/trusty/src/components/Organisms/Outcomes/tests/Outcomes.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/Outcomes/tests/Outcomes.test.tsx
index b216a433c4..58f1645f53 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/Outcomes/tests/Outcomes.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/Outcomes/tests/Outcomes.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import Outcomes from '../Outcomes';
 import { mount } from 'enzyme';
@@ -14,41 +32,23 @@ describe('Outcomes', () => {
 
     expect(wrapper).toMatchSnapshot();
     expect(wrapper.find('OutcomeCard')).toHaveLength(3);
+    expect(wrapper.find('h4.outcome-cards__card__title').at(0).text()).toMatch(
+      'Mortgage Approval'
+    );
     expect(
-      wrapper
-        .find('h4.outcome-cards__card__title')
-        .at(0)
-        .text()
-    ).toMatch('Mortgage Approval');
-    expect(
-      wrapper
-        .find('.outcome__property__value--bigger')
-        .at(0)
-        .text()
+      wrapper.find('.outcome__property__value--bigger').at(0).text()
     ).toMatch('true');
+    expect(wrapper.find('h4.outcome-cards__card__title').at(1).text()).toMatch(
+      'Risk Score'
+    );
     expect(
-      wrapper
-        .find('h4.outcome-cards__card__title')
-        .at(1)
-        .text()
-    ).toMatch('Risk Score');
-    expect(
-      wrapper
-        .find('.outcome__property__value--bigger')
-        .at(1)
-        .text()
+      wrapper.find('.outcome__property__value--bigger').at(1).text()
     ).toMatch('21.7031851958099');
+    expect(wrapper.find('h4.outcome-cards__card__title').at(2).text()).toMatch(
+      'Client Score'
+    );
     expect(
-      wrapper
-        .find('h4.outcome-cards__card__title')
-        .at(2)
-        .text()
-    ).toMatch('Client Score');
-    expect(
-      wrapper
-        .find('.outcome__property__value--bigger')
-        .at(2)
-        .text()
+      wrapper.find('.outcome__property__value--bigger').at(2).text()
     ).toMatch('Null');
   });
 
@@ -71,30 +71,18 @@ describe('Outcomes', () => {
     expect(wrapper).toMatchSnapshot();
     expect(wrapper.find('OutcomeCard')).toHaveLength(1);
     expect(wrapper.find('.outcome-item')).toHaveLength(2);
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(0)
-        .text()
-    ).toMatch('Auth Code');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(0)
-        .text()
-    ).toMatch('Authorized');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(1)
-        .text()
-    ).toMatch('Amount');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(1)
-        .text()
-    ).toMatch('10000');
+    expect(wrapper.find('div.outcome__property__name').at(0).text()).toMatch(
+      'Auth Code'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(0).text()).toMatch(
+      'Authorized'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(1).text()).toMatch(
+      'Amount'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(1).text()).toMatch(
+      '10000'
+    );
   });
 
   test('renders an outcome with an array of values', () => {
@@ -104,12 +92,9 @@ describe('Outcomes', () => {
     expect(wrapper.find('OutcomeCard')).toHaveLength(1);
     expect(wrapper.find('FormattedList')).toHaveLength(1);
     expect(wrapper.find('FormattedValue')).toHaveLength(4);
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(0)
-        .text()
-    ).toMatch('Result');
+    expect(wrapper.find('div.outcome__property__name').at(0).text()).toMatch(
+      'Result'
+    );
   });
 
   test('renders a recommendation outcome as a list of cards', () => {
@@ -119,10 +104,7 @@ describe('Outcomes', () => {
     expect(wrapper.find('OutcomeCard')).toHaveLength(2);
     expect(wrapper.find('span.outcome-cards__card__label')).toHaveLength(2);
     expect(
-      wrapper
-        .find('span.outcome-cards__card__label')
-        .at(0)
-        .text()
+      wrapper.find('span.outcome-cards__card__label').at(0).text()
     ).toMatch(outcomesRecommendationProps.outcomes[0].outcomeName);
   });
 
@@ -131,123 +113,66 @@ describe('Outcomes', () => {
 
     expect(wrapper).toMatchSnapshot();
     expect(wrapper.find('OutcomeCard')).toHaveLength(1);
-    expect(
-      wrapper
-        .find('h4.outcome-cards__card__title')
-        .at(0)
-        .text()
-    ).toMatch(outcomeComposedProps.outcomes[0].outcomeName);
+    expect(wrapper.find('h4.outcome-cards__card__title').at(0).text()).toMatch(
+      outcomeComposedProps.outcomes[0].outcomeName
+    );
     expect(wrapper.find('.outcome--struct')).toHaveLength(4);
     expect(wrapper.find('.outcome-item')).toHaveLength(10);
     expect(wrapper.find('.outcome__title--struct')).toHaveLength(4);
-    expect(
-      wrapper
-        .find('.outcome__title--struct')
-        .at(0)
-        .text()
-    ).toMatch('Client Ratings');
-    expect(
-      wrapper
-        .find('.outcome__title--struct')
-        .at(1)
-        .text()
-    ).toMatch('Rating Type A');
-    expect(
-      wrapper
-        .find('.outcome__title--struct')
-        .at(2)
-        .text()
-    ).toMatch('Rating Type B');
-    expect(
-      wrapper
-        .find('.outcome__title--struct')
-        .at(3)
-        .text()
-    ).toMatch('Sub-Rating Type C');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(0)
-        .text()
-    ).toMatch('Loan Amount');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(0)
-        .text()
-    ).toMatch('540000');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(1)
-        .text()
-    ).toMatch('Repayment Rate');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(1)
-        .text()
-    ).toMatch('900');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(2)
-        .text()
-    ).toMatch('Loan Eligibility');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(2)
-        .text()
-    ).toMatch('true');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(3)
-        .text()
-    ).toMatch('Loan amount');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(3)
-        .text()
-    ).toMatch('340000');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(4)
-        .text()
-    ).toMatch('Repayment rate');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(4)
-        .text()
-    ).toMatch('2000');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(5)
-        .text()
-    ).toMatch('Loan amount');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(5)
-        .text()
-    ).toMatch('390000');
-    expect(
-      wrapper
-        .find('div.outcome__property__name')
-        .at(6)
-        .text()
-    ).toMatch('Repayment rate');
-    expect(
-      wrapper
-        .find('div.outcome__property__value')
-        .at(6)
-        .text()
-    ).toMatch('5000');
+    expect(wrapper.find('.outcome__title--struct').at(0).text()).toMatch(
+      'Client Ratings'
+    );
+    expect(wrapper.find('.outcome__title--struct').at(1).text()).toMatch(
+      'Rating Type A'
+    );
+    expect(wrapper.find('.outcome__title--struct').at(2).text()).toMatch(
+      'Rating Type B'
+    );
+    expect(wrapper.find('.outcome__title--struct').at(3).text()).toMatch(
+      'Sub-Rating Type C'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(0).text()).toMatch(
+      'Loan Amount'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(0).text()).toMatch(
+      '540000'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(1).text()).toMatch(
+      'Repayment Rate'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(1).text()).toMatch(
+      '900'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(2).text()).toMatch(
+      'Loan Eligibility'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(2).text()).toMatch(
+      'true'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(3).text()).toMatch(
+      'Loan amount'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(3).text()).toMatch(
+      '340000'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(4).text()).toMatch(
+      'Repayment rate'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(4).text()).toMatch(
+      '2000'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(5).text()).toMatch(
+      'Loan amount'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(5).text()).toMatch(
+      '390000'
+    );
+    expect(wrapper.find('div.outcome__property__name').at(6).text()).toMatch(
+      'Repayment rate'
+    );
+    expect(wrapper.find('div.outcome__property__value').at(6).text()).toMatch(
+      '5000'
+    );
   });
 
   test('renders a skipped decision with no outcome', () => {
diff --git a/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/PaginationContainer.tsx b/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/PaginationContainer.tsx
index 7829e14e7f..f318eac0ae 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/PaginationContainer.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/PaginationContainer.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { Pagination, PaginationVariant } from '@patternfly/react-core';
 
diff --git a/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/tests/PaginationContainer.test.tsx b/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/tests/PaginationContainer.test.tsx
index d2f926e8d6..338bcf52c2 100644
--- a/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/tests/PaginationContainer.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Organisms/PaginationContainer/tests/PaginationContainer.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import PaginationContainer from '../PaginationContainer';
diff --git a/ui-packages/packages/trusty/src/components/Templates/ApplicationError/ApplicationError.tsx b/ui-packages/packages/trusty/src/components/Templates/ApplicationError/ApplicationError.tsx
index ae86e35250..cfe8fddcc9 100644
--- a/ui-packages/packages/trusty/src/components/Templates/ApplicationError/ApplicationError.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/ApplicationError/ApplicationError.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   EmptyState,
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/AuditDetail.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/AuditDetail.tsx
index c3e0847d97..128673bd17 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/AuditDetail.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/AuditDetail.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { ReactNode, useContext, useEffect, useState } from 'react';
 import {
   Nav,
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/AuditDetail.test.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/AuditDetail.test.tsx
index c3c91b2e8e..70f31d6b01 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/AuditDetail.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/AuditDetail.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import AuditDetail from '../AuditDetail';
@@ -101,16 +119,10 @@ describe('AuditDetail', () => {
     );
     expect(wrapper.find('Switch Route')).toHaveLength(1);
     expect(
-      wrapper
-        .find('Route StackItem')
-        .at(0)
-        .find('SkeletonStripe')
+      wrapper.find('Route StackItem').at(0).find('SkeletonStripe')
     ).toHaveLength(1);
     expect(
-      wrapper
-        .find('Route StackItem')
-        .at(1)
-        .find('SkeletonCards')
+      wrapper.find('Route StackItem').at(1).find('SkeletonCards')
     ).toHaveLength(1);
   });
 
@@ -169,18 +181,8 @@ describe('AuditDetail', () => {
     );
     expect(wrapper.find('Nav')).toHaveLength(1);
     expect(wrapper.find('NavItem')).toHaveLength(4);
-    expect(
-      wrapper
-        .find('NavItem a')
-        .at(0)
-        .text()
-    ).toMatch('Outcomes');
-    expect(
-      wrapper
-        .find('NavItem a')
-        .at(1)
-        .text()
-    ).toMatch('Outcomes details');
+    expect(wrapper.find('NavItem a').at(0).text()).toMatch('Outcomes');
+    expect(wrapper.find('NavItem a').at(1).text()).toMatch('Outcomes details');
     expect(wrapper.find('Switch Route')).toHaveLength(1);
     expect(wrapper.find('Switch Route').prop('path')).toMatch(
       '/audit/decision/b2b0ed8d-c1e2-46b5-3ac54ff4beae-1000/outcomes'
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useDecisionOutcomes.test.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useDecisionOutcomes.test.tsx
index 752de8eed0..efc1cb1cb6 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useDecisionOutcomes.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useDecisionOutcomes.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import { act } from 'react-test-renderer';
 import * as api from '../../../../utils/api/httpClient';
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useExecutionInfo.test.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useExecutionInfo.test.tsx
index 5096a817da..7416bed26b 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useExecutionInfo.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/tests/useExecutionInfo.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import { act } from 'react-test-renderer';
 import * as api from '../../../../utils/api/httpClient';
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useDecisionOutcomes.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useDecisionOutcomes.tsx
index 6dcddef78c..616f33b104 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useDecisionOutcomes.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useDecisionOutcomes.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { EXECUTIONS_PATH } from '../../../utils/api/httpClient';
 import { Outcome, RemoteData, RemoteDataStatus } from '../../../types';
 import useAPI from '../../../utils/api/useAPI';
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useExecutionInfo.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useExecutionInfo.tsx
index 6e5cf2c4f8..9a6d3d4041 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useExecutionInfo.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditDetail/useExecutionInfo.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { Execution } from '../../../types';
 import { EXECUTIONS_PATH } from '../../../utils/api/httpClient';
 import useAPI from '../../../utils/api/useAPI';
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/AuditOverview.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/AuditOverview.tsx
index dde2d74a1f..b0635cb129 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/AuditOverview.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/AuditOverview.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useEffect, useState } from 'react';
 import {
   PageSection,
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/AuditOverview.test.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/AuditOverview.test.tsx
index 4abe03e7a8..3cc7ef87fa 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/AuditOverview.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/AuditOverview.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { MemoryRouter } from 'react-router-dom';
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/useExecutions.test.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/useExecutions.test.tsx
index 0915bc56b5..13071de54c 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/useExecutions.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/tests/useExecutions.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import useExecutions from '../useExecutions';
 import * as api from '../../../../utils/api/httpClient';
@@ -84,7 +102,7 @@ describe('useExecutions', () => {
 
     let apiMockConfig = {};
 
-    apiMock.mockImplementation(() => config => {
+    apiMock.mockImplementation(() => (config) => {
       apiMockConfig = config;
       return Promise.resolve(executionsResponse) as AxiosPromise;
     });
@@ -136,7 +154,7 @@ describe('useExecutions', () => {
   it('returns a loading error when APIs call fails', async () => {
     let apiMockConfig = {};
 
-    apiMock.mockImplementation(() => config => {
+    apiMock.mockImplementation(() => (config) => {
       apiMockConfig = config;
       return Promise.reject('error');
     });
diff --git a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/useExecutions.tsx b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/useExecutions.tsx
index cb595873df..8f8a278bae 100644
--- a/ui-packages/packages/trusty/src/components/Templates/AuditOverview/useExecutions.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/AuditOverview/useExecutions.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import {
   callOnceHandler,
@@ -37,7 +55,7 @@ const useExecutions = (parameters: useExecutionsParameters) => {
     };
 
     getExecutions(config)
-      .then(response => {
+      .then((response) => {
         if (isMounted) {
           setExecutions({
             status: RemoteDataStatus.SUCCESS,
@@ -45,7 +63,7 @@ const useExecutions = (parameters: useExecutionsParameters) => {
           });
         }
       })
-      .catch(error => {
+      .catch((error) => {
         if (!axios.isCancel(error)) {
           setExecutions({ status: RemoteDataStatus.FAILURE, error });
         }
diff --git a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/Counterfactual.tsx b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/Counterfactual.tsx
index e005d70c06..2ea19a1c31 100644
--- a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/Counterfactual.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/Counterfactual.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useMemo, useRef } from 'react';
 import {
   Divider,
@@ -34,7 +52,7 @@ const Counterfactual = () => {
       return false;
     }
     return (
-      inputData.data.find(input => input.value.kind !== 'UNIT') !== undefined
+      inputData.data.find((input) => input.value.kind !== 'UNIT') !== undefined
     );
   }, [inputData]);
 
@@ -42,11 +60,11 @@ const Counterfactual = () => {
     if (inputData.status !== RemoteDataStatus.SUCCESS) {
       return false;
     }
-    const units = inputData.data.filter(input => input.value.kind === 'UNIT');
+    const units = inputData.data.filter((input) => input.value.kind === 'UNIT');
     if (units.length === 0) {
       return false;
     }
-    return units.every(input => typeof input.value.value === 'string');
+    return units.every((input) => typeof input.value.value === 'string');
   }, [inputData]);
 
   const hasOnlyUnsupportedOutcomes = useMemo(() => {
@@ -55,7 +73,7 @@ const Counterfactual = () => {
     }
     return (
       outcomesData.data.find(
-        outcome => outcome.outcomeResult.kind === 'UNIT'
+        (outcome) => outcome.outcomeResult.kind === 'UNIT'
       ) === undefined
     );
   }, [outcomesData]);
diff --git a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/counterfactualReducer.ts b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/counterfactualReducer.ts
index f530e1450a..9bc6324208 100644
--- a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/counterfactualReducer.ts
+++ b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/counterfactualReducer.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import {
   CFAnalysisResetType,
   CFAnalysisResult,
@@ -88,7 +106,7 @@ export const cfReducer = (state: CFState, action: cfActions): CFState => {
     case 'CF_TOGGLE_ALL_INPUTS': {
       const newState = {
         ...state,
-        searchDomains: state.searchDomains.map(input =>
+        searchDomains: state.searchDomains.map((input) =>
           isSearchInputTypeSupportedForCounterfactual(input)
             ? {
                 ...input,
@@ -176,8 +194,8 @@ export const cfInitState = (parameters: {
 
 const convertOutcomesToGoals = (outcomes: Outcome[]): CFGoal[] => {
   return outcomes
-    .filter(outcome => outcome.evaluationStatus === 'SUCCEEDED')
-    .map(outcome => {
+    .filter((outcome) => outcome.evaluationStatus === 'SUCCEEDED')
+    .map((outcome) => {
       return {
         id: outcome.outcomeId,
         name: outcome.outcomeName,
@@ -207,7 +225,7 @@ const convertInputToSearchDomain = (inputs: ItemObject[]): CFSearchInput[] => {
     }
     return cfSearchInput;
   };
-  return inputs.map(input => {
+  return inputs.map((input) => {
     return addIsFixed(input);
   });
 };
@@ -227,7 +245,7 @@ const convertInputToSearchDomainValue = (
       return {
         kind: 'COLLECTION',
         type: value.type,
-        value: value.value.map(v => convertInputToSearchDomainValue(v))
+        value: value.value.map((v) => convertInputToSearchDomainValue(v))
       };
     case 'STRUCTURE':
       Object.entries(value.value).forEach(([key, value]) => {
@@ -264,15 +282,15 @@ const areRequiredParametersSet = (state: CFState): boolean => {
 const areInputsSelected = (inputs: CFSearchInput[]) => {
   // filtering all non fixed inputs
   const selectedInputValues: CFSearchInputUnit[] = inputs
-    .filter(input => input.value.kind === 'UNIT')
-    .map(input => input.value as CFSearchInputUnit)
-    .filter(input => input.fixed === false);
+    .filter((input) => input.value.kind === 'UNIT')
+    .map((input) => input.value as CFSearchInputUnit)
+    .filter((input) => input.fixed === false);
   // checking if all inputs have a domain specified, with the exception of
   // booleans (do not require one)
   return (
     selectedInputValues.length > 0 &&
     selectedInputValues.every(
-      inputValue =>
+      (inputValue) =>
         inputValue.domain || typeof inputValue.originalValue.value === 'boolean'
     )
   );
@@ -281,7 +299,7 @@ const areInputsSelected = (inputs: CFSearchInput[]) => {
 const areGoalsSelected = (goals: CFGoal[]) => {
   return (
     goals.filter(
-      goal =>
+      (goal) =>
         !(
           goal.role == CFGoalRole.ORIGINAL ||
           goal.role == CFGoalRole.UNSUPPORTED
diff --git a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/Counterfactual.test.tsx b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/Counterfactual.test.tsx
index f489efe9e9..55781b0f5c 100644
--- a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/Counterfactual.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/Counterfactual.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import {
diff --git a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/CounterfactualReducer.test.ts b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/CounterfactualReducer.test.ts
index 1f64f7b828..cc4e80bf84 100644
--- a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/CounterfactualReducer.test.ts
+++ b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/tests/CounterfactualReducer.test.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { cfInitState, cfReducer, CFState } from '../counterfactualReducer';
 import {
   CFExecutionStatus,
@@ -156,7 +174,7 @@ describe('InitialStateMapping', () => {
   });
 
   test('SearchDomain::Object::JSON.stringify', () => {
-    const checks = object => {
+    const checks = (object) => {
       const i2 = (object.searchDomains[0].value as CFSearchInputStructure)
         .value['i2'];
       expect(i2).not.toBeUndefined();
@@ -417,7 +435,7 @@ describe('ToggleAll', () => {
   });
 });
 
-const setSearchDomain = state => {
+const setSearchDomain = (state) => {
   return setSearchDomainWithIndex(state, 0);
 };
 
@@ -437,7 +455,7 @@ const setSearchDomainWithIndex = (state, searchInputIndex) => {
   });
 };
 
-const setGoalUnsupported = state => {
+const setGoalUnsupported = (state) => {
   return cfReducer(state, {
     type: 'CF_SET_OUTCOMES',
     payload: [
@@ -460,7 +478,7 @@ const setGoalUnsupported = state => {
   });
 };
 
-const setGoalOriginal = state => {
+const setGoalOriginal = (state) => {
   return cfReducer(state, {
     type: 'CF_SET_OUTCOMES',
     payload: [
@@ -483,7 +501,7 @@ const setGoalOriginal = state => {
   });
 };
 
-const setGoalFloating = state => {
+const setGoalFloating = (state) => {
   return cfReducer(state, {
     type: 'CF_SET_OUTCOMES',
     payload: [
@@ -506,7 +524,7 @@ const setGoalFloating = state => {
   });
 };
 
-const setGoalFixed = state => {
+const setGoalFixed = (state) => {
   return cfReducer(state, {
     type: 'CF_SET_OUTCOMES',
     payload: [
diff --git a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/useCFSizes.ts b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/useCFSizes.ts
index 920eebfd7b..6380c0095e 100644
--- a/ui-packages/packages/trusty/src/components/Templates/Counterfactual/useCFSizes.ts
+++ b/ui-packages/packages/trusty/src/components/Templates/Counterfactual/useCFSizes.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { useEffect, useState } from 'react';
 import { debounce } from 'lodash';
 
diff --git a/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/ExecutionDetail.tsx b/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/ExecutionDetail.tsx
index b9293cb2dd..001d46cff5 100644
--- a/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/ExecutionDetail.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/ExecutionDetail.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 import { PageSection, Stack, StackItem, Title } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/tests/ExecutionDetail.test.tsx b/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/tests/ExecutionDetail.test.tsx
index e7ef85c553..2bfa372301 100644
--- a/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/tests/ExecutionDetail.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/ExecutionDetail/tests/ExecutionDetail.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { mount } from 'enzyme';
 import ExecutionDetail from '../ExecutionDetail';
@@ -27,13 +45,9 @@ describe('ExecutionDetail', () => {
   test('renders a list of outcomes', () => {
     const wrapper = mount(<ExecutionDetail outcomes={outcomes} />);
 
-    expect(
-      wrapper
-        .find('StackItem')
-        .at(0)
-        .find('Title')
-        .text()
-    ).toMatch('Outcomes');
+    expect(wrapper.find('StackItem').at(0).find('Title').text()).toMatch(
+      'Outcomes'
+    );
     expect(wrapper.find('SkeletonCards')).toHaveLength(0);
     expect(wrapper.find('Outcomes')).toHaveLength(1);
     expect(wrapper.find('Outcomes').prop('outcomes')).toStrictEqual(
diff --git a/ui-packages/packages/trusty/src/components/Templates/InputData/InputData.tsx b/ui-packages/packages/trusty/src/components/Templates/InputData/InputData.tsx
index 588c1c8a0c..28f9918735 100644
--- a/ui-packages/packages/trusty/src/components/Templates/InputData/InputData.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/InputData/InputData.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { useParams } from 'react-router-dom';
 import { PageSection, Stack, StackItem, Title } from '@patternfly/react-core';
diff --git a/ui-packages/packages/trusty/src/components/Templates/InputData/tests/InputData.test.tsx b/ui-packages/packages/trusty/src/components/Templates/InputData/tests/InputData.test.tsx
index 8c19268984..36ca4a8397 100644
--- a/ui-packages/packages/trusty/src/components/Templates/InputData/tests/InputData.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/InputData/tests/InputData.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import InputData from '../InputData';
diff --git a/ui-packages/packages/trusty/src/components/Templates/InputData/tests/useInputData.test.tsx b/ui-packages/packages/trusty/src/components/Templates/InputData/tests/useInputData.test.tsx
index 151075ca24..8ad275d653 100644
--- a/ui-packages/packages/trusty/src/components/Templates/InputData/tests/useInputData.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/InputData/tests/useInputData.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import { act } from 'react-test-renderer';
 import useInputData from '../useInputData';
diff --git a/ui-packages/packages/trusty/src/components/Templates/InputData/useInputData.tsx b/ui-packages/packages/trusty/src/components/Templates/InputData/useInputData.tsx
index 4f292c3605..0f937b1bdb 100644
--- a/ui-packages/packages/trusty/src/components/Templates/InputData/useInputData.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/InputData/useInputData.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { useMemo } from 'react';
 import { ItemObject, RemoteData, RemoteDataStatus } from '../../../types';
 import { AxiosError } from 'axios';
diff --git a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/ModelLookup.tsx b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/ModelLookup.tsx
index 2070139b77..b69ecbe67b 100644
--- a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/ModelLookup.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/ModelLookup.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { Divider, PageSection } from '@patternfly/react-core';
 import useModelData from './useModelData';
diff --git a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/ModelLookup.test.tsx b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/ModelLookup.test.tsx
index b038243e79..d8520f0491 100644
--- a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/ModelLookup.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/ModelLookup.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import ModelLookup from '../ModelLookup';
diff --git a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/useModelData.test.tsx b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/useModelData.test.tsx
index ac00e04302..e988ec23e1 100644
--- a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/useModelData.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/tests/useModelData.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import { act } from 'react-test-renderer';
 import useModelData from '../useModelData';
diff --git a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/useModelData.tsx b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/useModelData.tsx
index f7166a0f20..3393c8e107 100644
--- a/ui-packages/packages/trusty/src/components/Templates/ModelLookup/useModelData.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/ModelLookup/useModelData.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { ModelData } from '../../../types';
 import { EXECUTIONS_PATH } from '../../../utils/api/httpClient';
 import useAPI from '../../../utils/api/useAPI';
diff --git a/ui-packages/packages/trusty/src/components/Templates/NotFound/NotFound.tsx b/ui-packages/packages/trusty/src/components/Templates/NotFound/NotFound.tsx
index 8746fe4661..24cc147064 100644
--- a/ui-packages/packages/trusty/src/components/Templates/NotFound/NotFound.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/NotFound/NotFound.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import {
   EmptyState,
diff --git a/ui-packages/packages/trusty/src/components/Templates/NotFound/tests/NotFound.test.tsx b/ui-packages/packages/trusty/src/components/Templates/NotFound/tests/NotFound.test.tsx
index e7920e2cb6..7faa2ea65f 100644
--- a/ui-packages/packages/trusty/src/components/Templates/NotFound/tests/NotFound.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/NotFound/tests/NotFound.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { shallow } from 'enzyme';
 import NotFound from '../NotFound';
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/OutcomeDetails.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/OutcomeDetails.tsx
index 212c849b67..36b292200c 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/OutcomeDetails.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/OutcomeDetails.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useParams, useHistory, useLocation } from 'react-router-dom';
 import queryString from 'query-string';
@@ -67,7 +85,7 @@ const OutcomeDetails = ({ outcomes }: OutcomeDetailsProps) => {
       setOutcomeId(query.outcomeId as string);
       if (outcomesList) {
         const outcome = outcomesList.find(
-          item => item.outcomeId === query.outcomeId
+          (item) => item.outcomeId === query.outcomeId
         );
         setOutcomeData(outcome);
       }
@@ -94,19 +112,21 @@ const OutcomeDetails = ({ outcomes }: OutcomeDetailsProps) => {
           <SkeletonStripe customStyle={{ width: 400 }} />
         </PageSection>
       )}
-      {outcomeId !== null && outcomesList !== null && outcomesList.length > 1 && (
-        <PageSection
-          variant="light"
-          className="outcome-details__section--outcome-selector"
-        >
-          <Divider className="outcome-details__section--outcome-selector__divider" />
-          <OutcomeSwitch
-            currentExplanationId={outcomeId}
-            onDecisionSelection={switchExplanation}
-            outcomesList={outcomesList}
-          />
-        </PageSection>
-      )}
+      {outcomeId !== null &&
+        outcomesList !== null &&
+        outcomesList.length > 1 && (
+          <PageSection
+            variant="light"
+            className="outcome-details__section--outcome-selector"
+          >
+            <Divider className="outcome-details__section--outcome-selector__divider" />
+            <OutcomeSwitch
+              currentExplanationId={outcomeId}
+              onDecisionSelection={switchExplanation}
+              outcomesList={outcomesList}
+            />
+          </PageSection>
+        )}
       <PageSection
         variant="default"
         className="outcome-details__section outcome-details__outcome"
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/OutcomeDetails.test.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/OutcomeDetails.test.tsx
index 40943f4388..e449586c85 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/OutcomeDetails.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/OutcomeDetails.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router';
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useFeaturesScores.test.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useFeaturesScores.test.tsx
index 468f878a2e..43925a4ccc 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useFeaturesScores.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useFeaturesScores.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import useFeaturesScores from '../useFeaturesScores';
 import {
@@ -34,14 +52,14 @@ describe('useFeaturesScores', () => {
   });
 });
 
-const getSortedScores = selectedOutcomeId => {
+const getSortedScores = (selectedOutcomeId) => {
   if (saliencies.status === RemoteDataStatus.SUCCESS) {
     const values = saliencies.data.saliencies.find(
-      item => item.outcomeId === selectedOutcomeId
+      (item) => item.outcomeId === selectedOutcomeId
     );
     return orderBy(
       values.featureImportance,
-      item => Math.abs(item.featureScore),
+      (item) => Math.abs(item.featureScore),
       'asc'
     );
   }
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useOutcomeDetail.test.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useOutcomeDetail.test.tsx
index 3ec9f72ac4..ce081b40b0 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useOutcomeDetail.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useOutcomeDetail.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import useOutcomeDetail from '../useOutcomeDetail';
 import { act } from 'react-test-renderer';
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useSaliencies.test.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useSaliencies.test.tsx
index 22672e4368..33b9a40935 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useSaliencies.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/tests/useSaliencies.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import useSaliencies from '../useSaliencies';
 import * as api from '../../../../utils/api/httpClient';
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useFeaturesScores.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useFeaturesScores.tsx
index a364c35ef8..d830946ee5 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useFeaturesScores.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useFeaturesScores.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { useEffect, useState } from 'react';
 import {
   FeatureScores,
@@ -25,7 +43,7 @@ const useFeaturesScores = (
       if (saliencies.data.status === SaliencyStatus.SUCCEEDED) {
         const selectedExplanation = find(
           saliencies.data.saliencies,
-          saliency => {
+          (saliency) => {
             return saliency.outcomeId === outcomeId;
           }
         );
@@ -33,7 +51,7 @@ const useFeaturesScores = (
         if (selectedExplanation) {
           const sortedFeatures = orderBy(
             selectedExplanation.featureImportance,
-            item => Math.abs(item.featureScore),
+            (item) => Math.abs(item.featureScore),
             'asc'
           );
           setFeaturesScores(sortedFeatures as FeatureScores[]);
@@ -44,10 +62,10 @@ const useFeaturesScores = (
           }
 
           const positiveFeatures = sortedFeatures.filter(
-            feature => feature.featureScore > 0
+            (feature) => feature.featureScore > 0
           );
           const negativeFeatures = sortedFeatures.filter(
-            feature => feature.featureScore < 0
+            (feature) => feature.featureScore < 0
           );
           if (positiveFeatures.length > 5 || negativeFeatures.length > 5) {
             setTopFeaturesScoresBySign([
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useOutcomeDetail.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useOutcomeDetail.tsx
index 8f9fc1747f..bb24603205 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useOutcomeDetail.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useOutcomeDetail.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { useMemo } from 'react';
 import { ItemObject, RemoteData, RemoteDataStatus } from '../../../types';
 import { AxiosError } from 'axios';
diff --git a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useSaliencies.tsx b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useSaliencies.tsx
index 74efde4c83..7636138376 100644
--- a/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useSaliencies.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/OutcomeDetails/useSaliencies.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { Saliencies } from '../../../types';
 
 import { EXECUTIONS_PATH } from '../../../utils/api/httpClient';
diff --git a/ui-packages/packages/trusty/src/components/Templates/TrustyApp/TrustyApp.tsx b/ui-packages/packages/trusty/src/components/Templates/TrustyApp/TrustyApp.tsx
index 22544ad2b5..5595aa498f 100644
--- a/ui-packages/packages/trusty/src/components/Templates/TrustyApp/TrustyApp.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/TrustyApp/TrustyApp.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React, { useContext, useState } from 'react';
 import {
   BrowserRouter,
diff --git a/ui-packages/packages/trusty/src/components/Templates/TrustyApp/tests/TrustyApp.test.tsx b/ui-packages/packages/trusty/src/components/Templates/TrustyApp/tests/TrustyApp.test.tsx
index b83d3dd262..60b9614501 100644
--- a/ui-packages/packages/trusty/src/components/Templates/TrustyApp/tests/TrustyApp.test.tsx
+++ b/ui-packages/packages/trusty/src/components/Templates/TrustyApp/tests/TrustyApp.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import * as React from 'react';
 import { mount } from 'enzyme';
 import { MemoryRouter } from 'react-router';
@@ -82,12 +100,9 @@ describe('TrustyApp', () => {
       </MemoryRouter>
     );
 
-    expect(
-      wrapper
-        .find('a.trusty-home-link')
-        .at(0)
-        .props().href
-    ).toMatch('/trusty-base-path/');
+    expect(wrapper.find('a.trusty-home-link').at(0).props().href).toMatch(
+      '/trusty-base-path/'
+    );
   });
 
   test('uses "/" as base path for links when no basePath prop is provided', () => {
@@ -112,12 +127,7 @@ describe('TrustyApp', () => {
       </MemoryRouter>
     );
 
-    expect(
-      wrapper
-        .find('a.trusty-home-link')
-        .at(0)
-        .props().href
-    ).toMatch('/');
+    expect(wrapper.find('a.trusty-home-link').at(0).props().href).toMatch('/');
   });
 
   test('does not include a react router when excludeReactRouter is set to true', () => {
diff --git a/ui-packages/packages/trusty/src/index.ts b/ui-packages/packages/trusty/src/index.ts
index f507110491..7dde1a0715 100644
--- a/ui-packages/packages/trusty/src/index.ts
+++ b/ui-packages/packages/trusty/src/index.ts
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 export { default as TrustyApp } from './components/Templates/TrustyApp/TrustyApp';
diff --git a/ui-packages/packages/trusty/src/static/fonts/RedHatMono/RedHatMono.css b/ui-packages/packages/trusty/src/static/fonts/RedHatMono/RedHatMono.css
index ba57b99490..fe314cafea 100644
--- a/ui-packages/packages/trusty/src/static/fonts/RedHatMono/RedHatMono.css
+++ b/ui-packages/packages/trusty/src/static/fonts/RedHatMono/RedHatMono.css
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 @font-face {
   font-family: 'RedHatMono';
   src: url('./RedHatMonoVF.woff2') format('woff2-variations');
diff --git a/ui-packages/packages/trusty/src/types.ts b/ui-packages/packages/trusty/src/types.ts
index 604cbde153..3fbff0bd19 100644
--- a/ui-packages/packages/trusty/src/types.ts
+++ b/ui-packages/packages/trusty/src/types.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 export interface TrustyContextValue {
   config: {
     counterfactualEnabled: boolean;
diff --git a/ui-packages/packages/trusty/src/utils/api/httpClient.ts b/ui-packages/packages/trusty/src/utils/api/httpClient.ts
index 24cefa955a..b6db286aee 100644
--- a/ui-packages/packages/trusty/src/utils/api/httpClient.ts
+++ b/ui-packages/packages/trusty/src/utils/api/httpClient.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import axios, { AxiosRequestConfig, CancelTokenSource } from 'axios';
 
 declare global {
diff --git a/ui-packages/packages/trusty/src/utils/api/tests/useAPI.test.tsx b/ui-packages/packages/trusty/src/utils/api/tests/useAPI.test.tsx
index 9e05e1045a..a68b9e75f8 100644
--- a/ui-packages/packages/trusty/src/utils/api/tests/useAPI.test.tsx
+++ b/ui-packages/packages/trusty/src/utils/api/tests/useAPI.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { renderHook } from '@testing-library/react-hooks';
 import { act } from 'react-test-renderer';
 import * as api from '../httpClient';
@@ -38,7 +56,7 @@ const contextWrapper = ({ children }) => (
 describe('useAPI', () => {
   test('redirects to the error page when a request fails', async () => {
     let apiMockConfig = {};
-    apiMock.mockImplementation(config => {
+    apiMock.mockImplementation((config) => {
       apiMockConfig = config;
       return Promise.reject('error');
     });
diff --git a/ui-packages/packages/trusty/src/utils/api/useAPI.ts b/ui-packages/packages/trusty/src/utils/api/useAPI.ts
index c37cda5093..520abe440a 100644
--- a/ui-packages/packages/trusty/src/utils/api/useAPI.ts
+++ b/ui-packages/packages/trusty/src/utils/api/useAPI.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import { useContext, useEffect, useState } from 'react';
 import { AxiosError, AxiosRequestConfig } from 'axios';
 import { RemoteData, RemoteDataStatus } from '../../types';
@@ -29,7 +47,7 @@ const useAPI = <T>(
 
       setData({ status: RemoteDataStatus.LOADING });
       httpClient(config)
-        .then(response => {
+        .then((response) => {
           if (isMounted) {
             setData({
               status: RemoteDataStatus.SUCCESS,
@@ -37,7 +55,7 @@ const useAPI = <T>(
             });
           }
         })
-        .catch(error => {
+        .catch((error) => {
           setData({ status: RemoteDataStatus.FAILURE, error });
           history.replace('/error');
         });
diff --git a/ui-packages/packages/trusty/src/utils/formattedScore/formattedScore.ts b/ui-packages/packages/trusty/src/utils/formattedScore/formattedScore.ts
index d93f5646b1..82c8bb1119 100644
--- a/ui-packages/packages/trusty/src/utils/formattedScore/formattedScore.ts
+++ b/ui-packages/packages/trusty/src/utils/formattedScore/formattedScore.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const formattedScore = (inputScore: number) => {
   return Math.abs(inputScore) < 0.01 && Math.abs(inputScore) > 0
     ? `\u003c ${Math.sign(inputScore) * 0.01}`
diff --git a/ui-packages/packages/trusty/src/utils/formattedScore/tests/formattedScore.test.ts b/ui-packages/packages/trusty/src/utils/formattedScore/tests/formattedScore.test.ts
index 1ceb75097d..04678649bb 100644
--- a/ui-packages/packages/trusty/src/utils/formattedScore/tests/formattedScore.test.ts
+++ b/ui-packages/packages/trusty/src/utils/formattedScore/tests/formattedScore.test.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import formattedScore from '../formattedScore';
 
 describe('format scores', () => {
diff --git a/ui-packages/packages/trusty/src/utils/skeletonRows/skeletonRows.tsx b/ui-packages/packages/trusty/src/utils/skeletonRows/skeletonRows.tsx
index 02b9dfd69f..12f7d3bcdb 100644
--- a/ui-packages/packages/trusty/src/utils/skeletonRows/skeletonRows.tsx
+++ b/ui-packages/packages/trusty/src/utils/skeletonRows/skeletonRows.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import { IRow } from '@patternfly/react-table';
 import SkeletonStripe from '../../components/Atoms/SkeletonStripe/SkeletonStripe';
diff --git a/ui-packages/packages/trusty/src/utils/skeletonRows/tests/skeletonRows.test.tsx b/ui-packages/packages/trusty/src/utils/skeletonRows/tests/skeletonRows.test.tsx
index 93aa81c284..4f395dc53d 100644
--- a/ui-packages/packages/trusty/src/utils/skeletonRows/tests/skeletonRows.test.tsx
+++ b/ui-packages/packages/trusty/src/utils/skeletonRows/tests/skeletonRows.test.tsx
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import React from 'react';
 import skeletonRows from '../skeletonRows';
 import { shallow, mount } from 'enzyme';
diff --git a/ui-packages/packages/trusty/webpack.common.js b/ui-packages/packages/trusty/webpack.common.js
index 246e698be9..7eb6958e5c 100644
--- a/ui-packages/packages/trusty/webpack.common.js
+++ b/ui-packages/packages/trusty/webpack.common.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const webpack = require('webpack');
@@ -36,7 +54,7 @@ module.exports = {
         use: {
           loader: 'file-loader',
           options: {
-            // Limit at 50k. larger files emitted into separate files 
+            // Limit at 50k. larger files emitted into separate files
             limit: 5000,
             outputPath: 'fonts',
             name: '[name].[ext]'
@@ -58,7 +76,7 @@ module.exports = {
       },
       {
         test: /\.svg$/,
-        include: input => input.indexOf(BG_IMAGES_DIRNAME) > -1,
+        include: (input) => input.indexOf(BG_IMAGES_DIRNAME) > -1,
         use: {
           loader: 'svg-url-loader',
           options: {}
@@ -92,7 +110,7 @@ module.exports = {
       new TsconfigPathsPlugin({
         configFile: path.resolve(__dirname, './tsconfig.json')
       })
-    ], 
+    ],
     cacheWithContext: false
   },
   externals: {
diff --git a/ui-packages/packages/trusty/webpack.prod.js b/ui-packages/packages/trusty/webpack.prod.js
index a1f11c458f..a77cd687a0 100644
--- a/ui-packages/packages/trusty/webpack.prod.js
+++ b/ui-packages/packages/trusty/webpack.prod.js
@@ -1,7 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 
 module.exports = merge(common, {
   mode: 'production',
diff --git a/ui-packages/packages/workflow-form/config/Jest-config/babel-jest-wrapper.js b/ui-packages/packages/workflow-form/config/Jest-config/babel-jest-wrapper.js
index bdf97ca085..de03a7c210 100644
--- a/ui-packages/packages/workflow-form/config/Jest-config/babel-jest-wrapper.js
+++ b/ui-packages/packages/workflow-form/config/Jest-config/babel-jest-wrapper.js
@@ -1,3 +1,21 @@
-module.exports = require("babel-jest").createTransformer({
-    rootMode: "upward",
-  });
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+module.exports = require('babel-jest').createTransformer({
+  rootMode: 'upward'
+});
diff --git a/ui-packages/packages/workflow-form/config/Jest-config/canvas-mock.js b/ui-packages/packages/workflow-form/config/Jest-config/canvas-mock.js
index cfcccfd2b6..c19aca07a5 100644
--- a/ui-packages/packages/workflow-form/config/Jest-config/canvas-mock.js
+++ b/ui-packages/packages/workflow-form/config/Jest-config/canvas-mock.js
@@ -1,17 +1,19 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import 'jest-canvas-mock';
diff --git a/ui-packages/packages/workflow-form/config/Jest-config/fileMocks.js b/ui-packages/packages/workflow-form/config/Jest-config/fileMocks.js
index be448f1f77..8f4478c812 100755
--- a/ui-packages/packages/workflow-form/config/Jest-config/fileMocks.js
+++ b/ui-packages/packages/workflow-form/config/Jest-config/fileMocks.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const path = require('path');
 
 module.exports = {
diff --git a/ui-packages/packages/workflow-form/config/Jest-config/global-setup.js b/ui-packages/packages/workflow-form/config/Jest-config/global-setup.js
index 6e1fbf41d0..443daa8b72 100644
--- a/ui-packages/packages/workflow-form/config/Jest-config/global-setup.js
+++ b/ui-packages/packages/workflow-form/config/Jest-config/global-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = async () => {
   process.env.TZ = 'UTC';
 };
diff --git a/ui-packages/packages/workflow-form/config/Jest-config/styleMocks.js b/ui-packages/packages/workflow-form/config/Jest-config/styleMocks.js
index f053ebf797..ab22d88b5b 100755
--- a/ui-packages/packages/workflow-form/config/Jest-config/styleMocks.js
+++ b/ui-packages/packages/workflow-form/config/Jest-config/styleMocks.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 module.exports = {};
diff --git a/ui-packages/packages/workflow-form/config/Jest-config/test-setup.js b/ui-packages/packages/workflow-form/config/Jest-config/test-setup.js
index 928f21afd4..49163f29a4 100755
--- a/ui-packages/packages/workflow-form/config/Jest-config/test-setup.js
+++ b/ui-packages/packages/workflow-form/config/Jest-config/test-setup.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 const { TextDecoder } = require('util');
 
 global.TextDecoder = TextDecoder;
diff --git a/ui-packages/packages/workflow-form/config/Jest-config/test-shim.js b/ui-packages/packages/workflow-form/config/Jest-config/test-shim.js
index 0f650e3fca..d9a5ffbee0 100755
--- a/ui-packages/packages/workflow-form/config/Jest-config/test-shim.js
+++ b/ui-packages/packages/workflow-form/config/Jest-config/test-shim.js
@@ -1,3 +1,21 @@
-global.requestAnimationFrame = function(callback) {
-    setTimeout(callback, 0);
-};
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+global.requestAnimationFrame = function (callback) {
+  setTimeout(callback, 0);
+};
diff --git a/ui-packages/packages/workflow-form/jest.config.js b/ui-packages/packages/workflow-form/jest.config.js
index 99022d43e1..cd33884957 100644
--- a/ui-packages/packages/workflow-form/jest.config.js
+++ b/ui-packages/packages/workflow-form/jest.config.js
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 module.exports = {
   setupFiles: [
     './config/Jest-config/test-shim.js',
diff --git a/ui-packages/packages/workflow-form/package.json b/ui-packages/packages/workflow-form/package.json
index 8407471cc1..d36e3ee680 100644
--- a/ui-packages/packages/workflow-form/package.json
+++ b/ui-packages/packages/workflow-form/package.json
@@ -28,18 +28,16 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@kie-tools-core/envelope": "0.30.0",
-    "@kie-tools-core/envelope-bus": "0.30.0",
+    "@kie-tools-core/envelope": "0.32.0",
+    "@kie-tools-core/envelope-bus": "0.32.0",
     "@kogito-apps/components-common": "workspace:*",
     "@patternfly/patternfly": "^4.224.2",
-    "@patternfly/react-code-editor": "4.82.113",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",
diff --git a/ui-packages/packages/workflow-form/src/api/WorkflowFormApi.ts b/ui-packages/packages/workflow-form/src/api/WorkflowFormApi.ts
index f0042456b0..178066e4ce 100644
--- a/ui-packages/packages/workflow-form/src/api/WorkflowFormApi.ts
+++ b/ui-packages/packages/workflow-form/src/api/WorkflowFormApi.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface WorkflowFormApi {}
diff --git a/ui-packages/packages/workflow-form/src/api/WorkflowFormChannelApi.ts b/ui-packages/packages/workflow-form/src/api/WorkflowFormChannelApi.ts
index a3934a0d05..5500360087 100644
--- a/ui-packages/packages/workflow-form/src/api/WorkflowFormChannelApi.ts
+++ b/ui-packages/packages/workflow-form/src/api/WorkflowFormChannelApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface WorkflowFormChannelApi {
   workflowForm__resetBusinessKey(): Promise<void>;
   workflowForm__getCustomWorkflowSchema(): Promise<Record<string, any>>;
diff --git a/ui-packages/packages/workflow-form/src/api/WorkflowFormDriver.ts b/ui-packages/packages/workflow-form/src/api/WorkflowFormDriver.ts
index f69de6f08d..e18b8f04f8 100644
--- a/ui-packages/packages/workflow-form/src/api/WorkflowFormDriver.ts
+++ b/ui-packages/packages/workflow-form/src/api/WorkflowFormDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * Interface that defines a Driver for WorkflowForm views.
  */
diff --git a/ui-packages/packages/workflow-form/src/api/WorkflowFormEnvelopeApi.ts b/ui-packages/packages/workflow-form/src/api/WorkflowFormEnvelopeApi.ts
index be56e7b662..d0917630fd 100644
--- a/ui-packages/packages/workflow-form/src/api/WorkflowFormEnvelopeApi.ts
+++ b/ui-packages/packages/workflow-form/src/api/WorkflowFormEnvelopeApi.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export interface WorkflowFormEnvelopeApi {
   workflowForm__init(
     association: Association,
diff --git a/ui-packages/packages/workflow-form/src/api/index.ts b/ui-packages/packages/workflow-form/src/api/index.ts
index 2c774b285b..4906ce5bf1 100644
--- a/ui-packages/packages/workflow-form/src/api/index.ts
+++ b/ui-packages/packages/workflow-form/src/api/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './WorkflowFormApi';
 export * from './WorkflowFormChannelApi';
 export * from './WorkflowFormEnvelopeApi';
diff --git a/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowForm.tsx b/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowForm.tsx
index 39f2d99134..5e6235bf4b 100644
--- a/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowForm.tsx
+++ b/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback } from 'react';
 import { EnvelopeServer } from '@kie-tools-core/envelope-bus/dist/channel';
 import {
diff --git a/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowFormChannelApiImpl.ts b/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowFormChannelApiImpl.ts
index 25d5dc8caa..0b51031a73 100644
--- a/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowFormChannelApiImpl.ts
+++ b/ui-packages/packages/workflow-form/src/embedded/EmbeddedWorkflowFormChannelApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { WorkflowFormChannelApi, WorkflowFormDriver } from '../api';
 
 export class EmbeddedWorkflowFormChannelApiImpl
diff --git a/ui-packages/packages/workflow-form/src/embedded/index.ts b/ui-packages/packages/workflow-form/src/embedded/index.ts
index bf08088a57..ca6a097ef6 100644
--- a/ui-packages/packages/workflow-form/src/embedded/index.ts
+++ b/ui-packages/packages/workflow-form/src/embedded/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './EmbeddedWorkflowForm';
diff --git a/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowForm.test.tsx b/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowForm.test.tsx
index d105f05a39..5578c697a8 100644
--- a/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowForm.test.tsx
+++ b/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { render } from '@testing-library/react';
 import React from 'react';
 import {
diff --git a/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowFormChannelApiImpl.test.ts b/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowFormChannelApiImpl.test.ts
index c2d0799e8d..d30dff0f98 100755
--- a/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowFormChannelApiImpl.test.ts
+++ b/ui-packages/packages/workflow-form/src/embedded/tests/EmbeddedWorkflowFormChannelApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { WorkflowFormDriver } from '../../api';
 import { EmbeddedWorkflowFormChannelApiImpl } from '../EmbeddedWorkflowFormChannelApiImpl';
 import { MockedWorkflowFormDriver } from './mocks/Mocks';
diff --git a/ui-packages/packages/workflow-form/src/embedded/tests/mocks/Mocks.ts b/ui-packages/packages/workflow-form/src/embedded/tests/mocks/Mocks.ts
index a1a17b49f4..19b669b6a7 100644
--- a/ui-packages/packages/workflow-form/src/embedded/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/workflow-form/src/embedded/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { WorkflowFormDriver } from '../../../api';
 
 export const MockedWorkflowFormDriver = jest.fn<WorkflowFormDriver, []>(() => ({
diff --git a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelope.tsx b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelope.tsx
index 6832c56b0f..5c425a67e8 100644
--- a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelope.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelope.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { EnvelopeBus } from '@kie-tools-core/envelope-bus/dist/api';
diff --git a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeApiImpl.ts b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeApiImpl.ts
index 01fd60ca0e..918a218216 100644
--- a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeApiImpl.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeApiImpl.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import { WorkflowFormEnvelopeViewApi } from './WorkflowFormEnvelopeView';
 import {
diff --git a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeContext.ts b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeContext.ts
index 74228d0109..8f6191b122 100644
--- a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeContext.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeContext.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 /**
  * This is a convenience class that the Envelope view can use.
  */
diff --git a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeView.tsx b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeView.tsx
index 22a13ec100..5869d1592b 100644
--- a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeView.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeView.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.s
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, {
   useCallback,
   useEffect,
diff --git a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeViewDriver.ts b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeViewDriver.ts
index fae4c35d9d..098df2e195 100644
--- a/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeViewDriver.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/WorkflowFormEnvelopeViewDriver.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
 import { WorkflowFormChannelApi, WorkflowFormDriver } from '../api';
 
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/CustomWorkflowForm.tsx b/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/CustomWorkflowForm.tsx
index c47f5bbf90..db3bae14f5 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/CustomWorkflowForm.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/CustomWorkflowForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useState } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/__mocks__/CustomWorkflowForm.tsx b/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/__mocks__/CustomWorkflowForm.tsx
index c81bb6d999..6d55cbc599 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/__mocks__/CustomWorkflowForm.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/__mocks__/CustomWorkflowForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedCustomWorkflowForm = (): React.ReactElement => {
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/tests/CustomWorkflowForm.test.tsx b/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/tests/CustomWorkflowForm.test.tsx
index 43b94b4828..2daceb69c5 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/tests/CustomWorkflowForm.test.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/components/CustomWorkflowForm/tests/CustomWorkflowForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import wait from 'waait';
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/WorkflowForm.tsx b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/WorkflowForm.tsx
index d1c1280082..b27f18d4bd 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/WorkflowForm.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/WorkflowForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React, { useCallback, useState } from 'react';
 import {
   componentOuiaProps,
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/__mocks__/WorkflowForm.tsx b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/__mocks__/WorkflowForm.tsx
index 919eefe113..65bb7ffa66 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/__mocks__/WorkflowForm.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/__mocks__/WorkflowForm.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 
 const MockedWorkflowForm = (): React.ReactElement => {
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/WorkflowForm.test.tsx b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/WorkflowForm.test.tsx
index 811c333965..c7eabf9434 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/WorkflowForm.test.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/WorkflowForm.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import WorkflowForm, { WorkflowFormProps } from '../WorkflowForm';
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/__snapshots__/WorkflowForm.test.tsx.snap b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/__snapshots__/WorkflowForm.test.tsx.snap
index 6447171975..2a11260d45 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/__snapshots__/WorkflowForm.test.tsx.snap
+++ b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/__snapshots__/WorkflowForm.test.tsx.snap
@@ -223,7 +223,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                               aria-hidden="true"
                               class="margin-view-overlays"
                               role="presentation"
-                              style="position: absolute; width: 51px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; height: 19px;"
+                              style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 51px; height: 19px;"
                             >
                               <div
                                 style="position:absolute;top:0px;width:100%;height:19px;"
@@ -233,7 +233,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                                   style="width:51px; height:19px;"
                                 />
                                 <div
-                                  class="active-line-number line-numbers"
+                                  class="line-numbers active-line-number"
                                   style="left:0px;width:25px;"
                                 >
                                   1
@@ -255,14 +255,14 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                                 aria-hidden="true"
                                 class="view-overlays"
                                 role="presentation"
-                                style="position: absolute; height: 0px; width: 26px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; height: 0px; width: 35px;"
                               >
                                 <div
                                   style="position:absolute;top:0px;width:100%;height:19px;"
                                 >
                                   <div
                                     class="current-line"
-                                    style="width:26px; height:19px;"
+                                    style="width:35px; height:19px;"
                                   />
                                 </div>
                               </div>
@@ -282,7 +282,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                                 class="view-lines monaco-mouse-cursor-text"
                                 data-mprt="7"
                                 role="presentation"
-                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; width: 26px; height: 19px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 35px; height: 19px;"
                               >
                                 <div
                                   class="view-line"
@@ -305,7 +305,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                               >
                                 <div
                                   class="cursor monaco-mouse-cursor-text "
-                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; width: 2px;"
+                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; padding-left: 0px; width: 2px;"
                                 />
                               </div>
                             </div>
@@ -342,7 +342,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                           <div
                             aria-hidden="true"
                             role="presentation"
-                            style="width: -17px;"
+                            style="width: -9px;"
                           />
                           <textarea
                             aria-autocomplete="both"
@@ -357,7 +357,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                             data-mprt="6"
                             role="textbox"
                             spellcheck="false"
-                            style="font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
+                            style="tab-size: 20px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
                             tabindex="-1"
                             wrap="off"
                           />
@@ -369,12 +369,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                             class="overlayWidgets"
                             data-mprt="4"
                             style="width: 5px;"
-                          >
-                            <div
-                              style="position: absolute; top: 0px; right: 50%;"
-                              widgetid="editor.contrib.quickInputWidget"
-                            />
-                          </div>
+                          />
                           <div
                             aria-hidden="true"
                             class="minimap slider-mouseover"
@@ -399,7 +394,7 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                             />
                             <div
                               class="minimap-slider"
-                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: none; top: 0px; height: 0px;"
+                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: block; top: 0px; height: 0px;"
                             >
                               <div
                                 class="minimap-slider-horizontal"
@@ -407,6 +402,11 @@ exports[`WorkflowForm Test Workflow Form - loading 2`] = `
                               />
                             </div>
                           </div>
+                          <div
+                            aria-hidden="true"
+                            class="blockDecorations-container"
+                            role="presentation"
+                          />
                         </div>
                         <div
                           class="overflowingContentWidgets"
@@ -635,7 +635,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                               aria-hidden="true"
                               class="margin-view-overlays"
                               role="presentation"
-                              style="position: absolute; width: 51px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; height: 19px;"
+                              style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 51px; height: 19px;"
                             >
                               <div
                                 style="position:absolute;top:0px;width:100%;height:19px;"
@@ -645,7 +645,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                                   style="width:51px; height:19px;"
                                 />
                                 <div
-                                  class="active-line-number line-numbers"
+                                  class="line-numbers active-line-number"
                                   style="left:0px;width:25px;"
                                 >
                                   1
@@ -667,14 +667,14 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                                 aria-hidden="true"
                                 class="view-overlays"
                                 role="presentation"
-                                style="position: absolute; height: 0px; width: 26px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; height: 0px; width: 35px;"
                               >
                                 <div
                                   style="position:absolute;top:0px;width:100%;height:19px;"
                                 >
                                   <div
                                     class="current-line"
-                                    style="width:26px; height:19px;"
+                                    style="width:35px; height:19px;"
                                   />
                                 </div>
                               </div>
@@ -694,7 +694,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                                 class="view-lines monaco-mouse-cursor-text"
                                 data-mprt="7"
                                 role="presentation"
-                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; width: 26px; height: 19px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 35px; height: 19px;"
                               >
                                 <div
                                   class="view-line"
@@ -717,7 +717,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                               >
                                 <div
                                   class="cursor monaco-mouse-cursor-text "
-                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; width: 2px;"
+                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; padding-left: 0px; width: 2px;"
                                 />
                               </div>
                             </div>
@@ -754,7 +754,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                           <div
                             aria-hidden="true"
                             role="presentation"
-                            style="width: -17px;"
+                            style="width: -9px;"
                           />
                           <textarea
                             aria-autocomplete="both"
@@ -769,7 +769,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                             data-mprt="6"
                             role="textbox"
                             spellcheck="false"
-                            style="font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
+                            style="tab-size: 20px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
                             tabindex="-1"
                             wrap="off"
                           />
@@ -781,12 +781,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                             class="overlayWidgets"
                             data-mprt="4"
                             style="width: 5px;"
-                          >
-                            <div
-                              style="position: absolute; top: 0px; right: 50%;"
-                              widgetid="editor.contrib.quickInputWidget"
-                            />
-                          </div>
+                          />
                           <div
                             aria-hidden="true"
                             class="minimap slider-mouseover"
@@ -811,7 +806,7 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                             />
                             <div
                               class="minimap-slider"
-                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: none; top: 0px; height: 0px;"
+                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: block; top: 0px; height: 0px;"
                             >
                               <div
                                 class="minimap-slider-horizontal"
@@ -819,6 +814,11 @@ exports[`WorkflowForm Test Workflow Form - rendering 1`] = `
                               />
                             </div>
                           </div>
+                          <div
+                            aria-hidden="true"
+                            class="blockDecorations-container"
+                            role="presentation"
+                          />
                         </div>
                         <div
                           class="overflowingContentWidgets"
@@ -1047,7 +1047,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                               aria-hidden="true"
                               class="margin-view-overlays"
                               role="presentation"
-                              style="position: absolute; width: 51px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; height: 19px;"
+                              style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 51px; height: 19px;"
                             >
                               <div
                                 style="position:absolute;top:0px;width:100%;height:19px;"
@@ -1057,7 +1057,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                                   style="width:51px; height:19px;"
                                 />
                                 <div
-                                  class="active-line-number line-numbers"
+                                  class="line-numbers active-line-number"
                                   style="left:0px;width:25px;"
                                 >
                                   1
@@ -1079,14 +1079,14 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                                 aria-hidden="true"
                                 class="view-overlays"
                                 role="presentation"
-                                style="position: absolute; height: 0px; width: 26px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; height: 0px; width: 35px;"
                               >
                                 <div
                                   style="position:absolute;top:0px;width:100%;height:19px;"
                                 >
                                   <div
                                     class="current-line"
-                                    style="width:26px; height:19px;"
+                                    style="width:35px; height:19px;"
                                   />
                                 </div>
                               </div>
@@ -1106,7 +1106,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                                 class="view-lines monaco-mouse-cursor-text"
                                 data-mprt="7"
                                 role="presentation"
-                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; width: 26px; height: 19px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 35px; height: 19px;"
                               >
                                 <div
                                   class="view-line"
@@ -1129,7 +1129,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                               >
                                 <div
                                   class="cursor monaco-mouse-cursor-text "
-                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; width: 2px;"
+                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; padding-left: 0px; width: 2px;"
                                 />
                               </div>
                             </div>
@@ -1166,7 +1166,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                           <div
                             aria-hidden="true"
                             role="presentation"
-                            style="width: -17px;"
+                            style="width: -9px;"
                           />
                           <textarea
                             aria-autocomplete="both"
@@ -1181,7 +1181,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                             data-mprt="6"
                             role="textbox"
                             spellcheck="false"
-                            style="font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
+                            style="tab-size: 20px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
                             tabindex="-1"
                             wrap="off"
                           />
@@ -1193,12 +1193,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                             class="overlayWidgets"
                             data-mprt="4"
                             style="width: 5px;"
-                          >
-                            <div
-                              style="position: absolute; top: 0px; right: 50%;"
-                              widgetid="editor.contrib.quickInputWidget"
-                            />
-                          </div>
+                          />
                           <div
                             aria-hidden="true"
                             class="minimap slider-mouseover"
@@ -1223,7 +1218,7 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                             />
                             <div
                               class="minimap-slider"
-                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: none; top: 0px; height: 0px;"
+                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: block; top: 0px; height: 0px;"
                             >
                               <div
                                 class="minimap-slider-horizontal"
@@ -1231,6 +1226,11 @@ exports[`WorkflowForm Test Workflow Form - validation error 1`] = `
                               />
                             </div>
                           </div>
+                          <div
+                            aria-hidden="true"
+                            class="blockDecorations-container"
+                            role="presentation"
+                          />
                         </div>
                         <div
                           class="overflowingContentWidgets"
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/validateWorkflowData.test.ts b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/validateWorkflowData.test.ts
index 72880a1dc8..da3d70eb0b 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/validateWorkflowData.test.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/tests/validateWorkflowData.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { validateWorkflowData } from '../validateWorkflowData';
 
 describe('validateWorkflowData tests', function () {
diff --git a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/validateWorkflowData.ts b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/validateWorkflowData.ts
index 74ea84b2f2..ac09531507 100644
--- a/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/validateWorkflowData.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/components/WorkflowForm/validateWorkflowData.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2023 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import isPlainObject from 'lodash/isPlainObject';
 
 export function validateWorkflowData(data: string): boolean {
diff --git a/ui-packages/packages/workflow-form/src/envelope/index.ts b/ui-packages/packages/workflow-form/src/envelope/index.ts
index cc0b1929f3..cba9432059 100644
--- a/ui-packages/packages/workflow-form/src/envelope/index.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/index.ts
@@ -1,17 +1,19 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './WorkflowFormEnvelope';
diff --git a/ui-packages/packages/workflow-form/src/envelope/styles.css b/ui-packages/packages/workflow-form/src/envelope/styles.css
index 6187a0a0c2..fcff22532e 100644
--- a/ui-packages/packages/workflow-form/src/envelope/styles.css
+++ b/ui-packages/packages/workflow-form/src/envelope/styles.css
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 .kogito-workflow-form-container {
-    height: 100%;
-}
\ No newline at end of file
+  height: 100%;
+}
diff --git a/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeApiImpl.test.ts b/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeApiImpl.test.ts
index adf0c34118..0afa0f22bf 100644
--- a/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeApiImpl.test.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeApiImpl.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import { EnvelopeApiFactoryArgs } from '@kie-tools-core/envelope';
 import {
   MockedEnvelopeClient,
diff --git a/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeView.test.tsx b/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeView.test.tsx
index c400100674..ef2138e40b 100644
--- a/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeView.test.tsx
+++ b/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeView.test.tsx
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { render } from '@testing-library/react';
diff --git a/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeViewDriver.test.ts b/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeViewDriver.test.ts
index 9bbd73f519..446138b27c 100644
--- a/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeViewDriver.test.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/tests/WorkflowFormEnvelopeViewDriver.test.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   MessageBusClientApi,
   RequestPropertyNames
diff --git a/ui-packages/packages/workflow-form/src/envelope/tests/__snapshots__/WorkflowFormEnvelopeView.test.tsx.snap b/ui-packages/packages/workflow-form/src/envelope/tests/__snapshots__/WorkflowFormEnvelopeView.test.tsx.snap
index b536aec978..637ee1fd7e 100644
--- a/ui-packages/packages/workflow-form/src/envelope/tests/__snapshots__/WorkflowFormEnvelopeView.test.tsx.snap
+++ b/ui-packages/packages/workflow-form/src/envelope/tests/__snapshots__/WorkflowFormEnvelopeView.test.tsx.snap
@@ -336,7 +336,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                               aria-hidden="true"
                               class="margin-view-overlays"
                               role="presentation"
-                              style="position: absolute; width: 51px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; height: 19px;"
+                              style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 51px; height: 19px;"
                             >
                               <div
                                 style="position:absolute;top:0px;width:100%;height:19px;"
@@ -346,7 +346,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                                   style="width:51px; height:19px;"
                                 />
                                 <div
-                                  class="active-line-number line-numbers"
+                                  class="line-numbers active-line-number"
                                   style="left:0px;width:25px;"
                                 >
                                   1
@@ -368,14 +368,14 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                                 aria-hidden="true"
                                 class="view-overlays"
                                 role="presentation"
-                                style="position: absolute; height: 0px; width: 26px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; height: 0px; width: 35px;"
                               >
                                 <div
                                   style="position:absolute;top:0px;width:100%;height:19px;"
                                 >
                                   <div
                                     class="current-line"
-                                    style="width:26px; height:19px;"
+                                    style="width:35px; height:19px;"
                                   />
                                 </div>
                               </div>
@@ -395,7 +395,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                                 class="view-lines monaco-mouse-cursor-text"
                                 data-mprt="7"
                                 role="presentation"
-                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; width: 26px; height: 19px;"
+                                style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 35px; height: 19px;"
                               >
                                 <div
                                   class="view-line"
@@ -418,7 +418,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                               >
                                 <div
                                   class="cursor monaco-mouse-cursor-text "
-                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; width: 2px;"
+                                  style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; padding-left: 0px; width: 2px;"
                                 />
                               </div>
                             </div>
@@ -455,7 +455,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                           <div
                             aria-hidden="true"
                             role="presentation"
-                            style="width: -17px;"
+                            style="width: -9px;"
                           />
                           <textarea
                             aria-autocomplete="both"
@@ -470,7 +470,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                             data-mprt="6"
                             role="textbox"
                             spellcheck="false"
-                            style="font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
+                            style="tab-size: 20px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
                             tabindex="-1"
                             wrap="off"
                           />
@@ -482,12 +482,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                             class="overlayWidgets"
                             data-mprt="4"
                             style="width: 5px;"
-                          >
-                            <div
-                              style="position: absolute; top: 0px; right: 50%;"
-                              widgetid="editor.contrib.quickInputWidget"
-                            />
-                          </div>
+                          />
                           <div
                             aria-hidden="true"
                             class="minimap slider-mouseover"
@@ -512,7 +507,7 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                             />
                             <div
                               class="minimap-slider"
-                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: none; top: 0px; height: 0px;"
+                              style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: block; top: 0px; height: 0px;"
                             >
                               <div
                                 class="minimap-slider-horizontal"
@@ -520,6 +515,11 @@ exports[`WorkflowFormEnvelopeView tests Workflow Form 1`] = `
                               />
                             </div>
                           </div>
+                          <div
+                            aria-hidden="true"
+                            class="blockDecorations-container"
+                            role="presentation"
+                          />
                         </div>
                         <div
                           class="overflowingContentWidgets"
diff --git a/ui-packages/packages/workflow-form/src/envelope/tests/mocks/Mocks.ts b/ui-packages/packages/workflow-form/src/envelope/tests/mocks/Mocks.ts
index ae40d75fc9..77e3b6461f 100644
--- a/ui-packages/packages/workflow-form/src/envelope/tests/mocks/Mocks.ts
+++ b/ui-packages/packages/workflow-form/src/envelope/tests/mocks/Mocks.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 import {
   ApiNotificationConsumers,
   MessageBusClientApi,
diff --git a/ui-packages/packages/workflow-form/src/index.ts b/ui-packages/packages/workflow-form/src/index.ts
index bb1a7c405e..b661b98a15 100644
--- a/ui-packages/packages/workflow-form/src/index.ts
+++ b/ui-packages/packages/workflow-form/src/index.ts
@@ -1,19 +1,21 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 export * from './api';
 export * from './embedded';
 export * from './envelope';
diff --git a/ui-packages/pnpm-lock.yaml b/ui-packages/pnpm-lock.yaml
index 811e8494da..ae732831bc 100644
--- a/ui-packages/pnpm-lock.yaml
+++ b/ui-packages/pnpm-lock.yaml
@@ -17,14 +17,17 @@ overrides:
   '@types/react': 17.0.5
   ua-parser-js: 0.7.35
   yaml: 2.3.1
+  monaco-editor: ^0.39.0
+  react-monaco-editor: ^0.54.0
+  monaco-yaml: ^4.0.4
 
 importers:
 
   .:
     devDependencies:
       '@kie-tools/dashbuilder-client':
-        specifier: ^0.30.0
-        version: 0.30.0
+        specifier: ^0.32.0
+        version: 0.32.0
       '@kie/lock-treatment-tool':
         specifier: ^0.2.4
         version: 0.2.4
@@ -74,11 +77,11 @@ importers:
   packages/cloud-event-form:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -86,8 +89,8 @@ importers:
         specifier: ^4.224.2
         version: 4.224.2
       '@patternfly/react-code-editor':
-        specifier: 4.82.113
-        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.49.0)(react@17.0.2)
+        specifier: ^4.82.113
+        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.54.0)(react@17.0.2)
       '@patternfly/react-core':
         specifier: ^4.276.6
         version: 4.276.8(react-dom@17.0.2)(react@17.0.2)
@@ -97,18 +100,12 @@ importers:
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
-      monaco-yaml:
-        specifier: ^4.0.4
-        version: 4.0.4(monaco-editor@0.33.0)
       react:
         specifier: ^17.0.2
         version: 17.0.2
       react-dom:
         specifier: ^17.0.2
         version: 17.0.2(react@17.0.2)
-      react-monaco-editor:
-        specifier: ^0.49.0
-        version: 0.49.0(@types/react@17.0.5)(monaco-editor@0.33.0)(react@17.0.2)
     devDependencies:
       '@babel/core':
         specifier: ^7.22.8
@@ -185,9 +182,6 @@ importers:
       apollo-boost:
         specifier: ^0.4.9
         version: 0.4.9(graphql@14.3.1)
-      jsonpath:
-        specifier: ^1.1.1
-        version: 1.1.1
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
@@ -321,7 +315,7 @@ importers:
         version: 3.2.3(graphql@14.3.1)
       '@graphql-codegen/cli':
         specifier: ^2.16.5
-        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1)(typescript@4.9.5)
+        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1)(typescript@4.9.5)
       '@graphql-codegen/introspection':
         specifier: ^2.2.3
         version: 2.2.3(graphql@14.3.1)
@@ -386,11 +380,11 @@ importers:
   packages/custom-dashboard-list:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -471,11 +465,11 @@ importers:
   packages/custom-dashboard-view:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -499,8 +493,8 @@ importers:
         specifier: ^7.22.8
         version: 7.22.8
       '@kie-tools/dashbuilder-client':
-        specifier: ^0.30.0
-        version: 0.30.0
+        specifier: ^0.32.0
+        version: 0.32.0
       '@kogito-apps/ouia-tools':
         specifier: workspace:*
         version: link:../ouia-tools
@@ -562,11 +556,11 @@ importers:
   packages/form-details:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -580,8 +574,8 @@ importers:
         specifier: ^4.224.2
         version: 4.224.2
       '@patternfly/react-code-editor':
-        specifier: 4.82.113
-        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.49.0)(react@17.0.2)
+        specifier: ^4.82.113
+        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.54.0)(react@17.0.2)
       '@patternfly/react-core':
         specifier: ^4.276.6
         version: 4.276.8(react-dom@17.0.2)(react@17.0.2)
@@ -591,18 +585,12 @@ importers:
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
-      monaco-yaml:
-        specifier: ^4.0.4
-        version: 4.0.4(monaco-editor@0.33.0)
       react:
         specifier: ^17.0.2
         version: 17.0.2
       react-dom:
         specifier: ^17.0.2
         version: 17.0.2(react@17.0.2)
-      react-monaco-editor:
-        specifier: ^0.49.0
-        version: 0.49.0(@types/react@17.0.5)(monaco-editor@0.33.0)(react@17.0.2)
     devDependencies:
       '@babel/core':
         specifier: ^7.22.8
@@ -671,11 +659,11 @@ importers:
         specifier: ^10.3.1
         version: 10.3.1(react@17.0.2)
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -768,11 +756,11 @@ importers:
   packages/forms-list:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -862,11 +850,11 @@ importers:
   packages/jobs-management:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -962,11 +950,11 @@ importers:
   packages/management-console-shared:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.24.0
-        version: 0.24.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.24.0
-        version: 0.24.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -1127,7 +1115,7 @@ importers:
         version: 3.2.3(graphql@14.3.1)
       '@graphql-codegen/cli':
         specifier: ^2.16.5
-        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1)(typescript@4.9.5)
+        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1)(typescript@4.9.5)
       '@graphql-codegen/introspection':
         specifier: ^2.2.3
         version: 2.2.3(graphql@14.3.1)
@@ -1400,11 +1388,11 @@ importers:
   packages/process-definition-list:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -1476,20 +1464,20 @@ importers:
   packages/process-details:
     dependencies:
       '@kie-tools-core/editor':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools/serverless-workflow-combined-editor':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools/serverless-workflow-diagram-editor-assets':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -1588,11 +1576,11 @@ importers:
   packages/process-form:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -1682,11 +1670,11 @@ importers:
   packages/process-list:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -1811,7 +1799,7 @@ importers:
         version: 3.2.3(graphql@14.3.1)
       '@graphql-codegen/cli':
         specifier: ^2.16.5
-        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1)(typescript@4.9.5)
+        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1)(typescript@4.9.5)
       '@graphql-codegen/introspection':
         specifier: ^2.2.3
         version: 2.2.3(graphql@14.3.1)
@@ -1870,32 +1858,29 @@ importers:
         specifier: ^7.22.8
         version: 7.22.8
       '@kie-tools-core/editor':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/keyboard-shortcuts':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools/serverless-workflow-combined-editor':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools/serverless-workflow-diagram-editor-assets':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools/serverless-workflow-diagram-editor-envelope':
-        specifier: 0.30.0
-        version: 0.30.0
-      '@kie-tools/serverless-workflow-mermaid-viewer':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools/serverless-workflow-text-editor':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/cloud-event-form':
         specifier: workspace:*
         version: link:../cloud-event-form
@@ -1973,7 +1958,7 @@ importers:
         version: 4.224.2
       '@patternfly/react-code-editor':
         specifier: 4.82.113
-        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.49.0)(react@17.0.2)
+        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.54.0)(react@17.0.2)
       '@patternfly/react-core':
         specifier: ^4.276.6
         version: 4.276.8(react-dom@17.0.2)(react@17.0.2)
@@ -2005,14 +1990,14 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       monaco-editor:
-        specifier: ^0.33.0
-        version: 0.33.0
+        specifier: ^0.39.0
+        version: 0.39.0
       monaco-editor-webpack-plugin:
         specifier: ^7.1.0
-        version: 7.1.0(monaco-editor@0.33.0)(webpack@5.88.1)
+        version: 7.1.0(monaco-editor@0.39.0)(webpack@5.88.1)
       monaco-yaml:
         specifier: ^4.0.4
-        version: 4.0.4(monaco-editor@0.33.0)
+        version: 4.0.4(monaco-editor@0.39.0)
       react:
         specifier: ^17.0.2
         version: 17.0.2
@@ -2029,8 +2014,8 @@ importers:
         specifier: 0.9.7
         version: 0.9.7(moment@2.29.4)(prop-types@15.8.1)(react@17.0.2)
       react-monaco-editor:
-        specifier: ^0.49.0
-        version: 0.49.0(@types/react@17.0.5)(monaco-editor@0.33.0)(react@17.0.2)
+        specifier: ^0.54.0
+        version: 0.54.0(@types/react@17.0.5)(monaco-editor@0.39.0)(react@17.0.2)
       react-router:
         specifier: ^5.3.4
         version: 5.3.4(react@17.0.2)
@@ -2052,7 +2037,7 @@ importers:
         version: 3.2.3(graphql@14.3.1)
       '@graphql-codegen/cli':
         specifier: ^2.16.5
-        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1)(typescript@4.9.5)
+        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1)(typescript@4.9.5)
       '@graphql-codegen/introspection':
         specifier: ^2.2.3
         version: 2.2.3(graphql@14.3.1)
@@ -2120,8 +2105,8 @@ importers:
         specifier: ^6.2.0
         version: 6.2.0(webpack@5.88.1)
       filemanager-webpack-plugin:
-        specifier: ^6.1.7
-        version: 6.1.7(webpack@5.88.1)
+        specifier: ^7.0.0
+        version: 7.0.0(webpack@5.88.1)
       html-webpack-plugin:
         specifier: ^5.5.3
         version: 5.5.3(webpack@5.88.1)
@@ -2289,11 +2274,11 @@ importers:
   packages/task-console-webapp:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -2375,7 +2360,7 @@ importers:
         version: 3.2.3(graphql@14.3.1)
       '@graphql-codegen/cli':
         specifier: ^2.16.5
-        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1)(typescript@4.9.5)
+        version: 2.16.5(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1)(typescript@4.9.5)
       '@graphql-codegen/introspection':
         specifier: ^2.2.3
         version: 2.2.3(graphql@14.3.1)
@@ -2518,11 +2503,11 @@ importers:
   packages/task-details:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -2612,11 +2597,11 @@ importers:
   packages/task-form:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -2718,11 +2703,11 @@ importers:
   packages/task-inbox:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -2821,8 +2806,8 @@ importers:
   packages/trusty:
     dependencies:
       '@kie-tools/kie-editors-standalone':
-        specifier: ^0.30.0
-        version: 0.30.0
+        specifier: ^0.32.0
+        version: 0.32.0
       '@patternfly/react-charts':
         specifier: ^6.94.19
         version: 6.94.19(react-dom@17.0.2)(react@17.0.2)
@@ -3029,11 +3014,11 @@ importers:
   packages/workflow-form:
     dependencies:
       '@kie-tools-core/envelope':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kie-tools-core/envelope-bus':
-        specifier: 0.30.0
-        version: 0.30.0
+        specifier: 0.32.0
+        version: 0.32.0
       '@kogito-apps/components-common':
         specifier: workspace:*
         version: link:../components-common
@@ -3041,8 +3026,8 @@ importers:
         specifier: ^4.224.2
         version: 4.224.2
       '@patternfly/react-code-editor':
-        specifier: 4.82.113
-        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.49.0)(react@17.0.2)
+        specifier: ^4.82.113
+        version: 4.82.113(react-dom@17.0.2)(react-monaco-editor@0.54.0)(react@17.0.2)
       '@patternfly/react-core':
         specifier: ^4.276.6
         version: 4.276.8(react-dom@17.0.2)(react@17.0.2)
@@ -3052,18 +3037,12 @@ importers:
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
-      monaco-yaml:
-        specifier: ^4.0.4
-        version: 4.0.4(monaco-editor@0.33.0)
       react:
         specifier: ^17.0.2
         version: 17.0.2
       react-dom:
         specifier: ^17.0.2
         version: 17.0.2(react@17.0.2)
-      react-monaco-editor:
-        specifier: ^0.49.0
-        version: 0.49.0(@types/react@17.0.5)(monaco-editor@0.33.0)(react@17.0.2)
     devDependencies:
       '@babel/core':
         specifier: ^7.22.8
@@ -4746,10 +4725,6 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@braintree/sanitize-url@6.0.2:
-    resolution: {integrity: sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==}
-    dev: false
-
   /@cnakazawa/watch@1.0.4:
     resolution: {integrity: sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==}
     engines: {node: '>=0.1.95'}
@@ -4910,7 +4885,7 @@ packages:
       tslib: 2.4.1
     dev: true
 
-  /@graphql-codegen/cli@2.16.5(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1)(typescript@4.9.5):
+  /@graphql-codegen/cli@2.16.5(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1)(typescript@4.9.5):
     resolution: {integrity: sha512-XYPIp+q7fB0xAGSAoRykiTe4oY80VU+z+dw5nuv4mLY0+pv7+pa2C6Nwhdw7a65lXOhFviBApWCCZeqd54SMnA==}
     hasBin: true
     peerDependencies:
@@ -4924,22 +4899,22 @@ packages:
       '@graphql-tools/apollo-engine-loader': 7.3.26(graphql@14.3.1)
       '@graphql-tools/code-file-loader': 7.3.23(@babel/core@7.22.8)(graphql@14.3.1)
       '@graphql-tools/git-loader': 7.3.0(@babel/core@7.22.8)(graphql@14.3.1)
-      '@graphql-tools/github-loader': 7.3.28(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1)
+      '@graphql-tools/github-loader': 7.3.28(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1)
       '@graphql-tools/graphql-file-loader': 7.5.17(graphql@14.3.1)
       '@graphql-tools/json-file-loader': 7.4.18(graphql@14.3.1)
       '@graphql-tools/load': 7.8.14(graphql@14.3.1)
-      '@graphql-tools/prisma-loader': 7.2.72(@types/node@18.16.19)(graphql@14.3.1)
-      '@graphql-tools/url-loader': 7.17.18(@types/node@18.16.19)(graphql@14.3.1)
+      '@graphql-tools/prisma-loader': 7.2.72(@types/node@18.18.6)(graphql@14.3.1)
+      '@graphql-tools/url-loader': 7.17.18(@types/node@18.18.6)(graphql@14.3.1)
       '@graphql-tools/utils': 9.2.1(graphql@14.3.1)
-      '@whatwg-node/fetch': 0.6.9(@types/node@18.16.19)
+      '@whatwg-node/fetch': 0.6.9(@types/node@18.18.6)
       chalk: 4.1.2
       chokidar: 3.5.3
       cosmiconfig: 7.1.0
-      cosmiconfig-typescript-loader: 4.3.0(@types/node@18.16.19)(cosmiconfig@7.1.0)(ts-node@10.9.1)(typescript@4.9.5)
+      cosmiconfig-typescript-loader: 4.3.0(@types/node@18.18.6)(cosmiconfig@7.1.0)(ts-node@10.9.1)(typescript@4.9.5)
       debounce: 1.2.1
       detect-indent: 6.1.0
       graphql: 14.3.1
-      graphql-config: 4.5.0(@types/node@18.16.19)(graphql@14.3.1)
+      graphql-config: 4.5.0(@types/node@18.18.6)(graphql@14.3.1)
       inquirer: 8.2.5
       is-glob: 4.0.3
       json-to-pretty-yaml: 1.2.2
@@ -4948,7 +4923,7 @@ packages:
       shell-quote: 1.8.1
       string-env-interpolation: 1.0.1
       ts-log: 2.2.5
-      ts-node: 10.9.1(@types/node@18.16.19)(typescript@4.9.5)
+      ts-node: 10.9.1(@types/node@18.18.6)(typescript@4.9.5)
       tslib: 2.6.0
       yaml: 2.3.1
       yargs: 17.7.2
@@ -5198,7 +5173,7 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@graphql-tools/executor-http@0.1.10(@types/node@18.16.19)(graphql@14.3.1):
+  /@graphql-tools/executor-http@0.1.10(@types/node@18.18.6)(graphql@14.3.1):
     resolution: {integrity: sha512-hnAfbKv0/lb9s31LhWzawQ5hghBfHS+gYWtqxME6Rl0Aufq9GltiiLBcl7OVVOnkLF0KhwgbYP1mB5VKmgTGpg==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
@@ -5209,7 +5184,7 @@ packages:
       dset: 3.1.2
       extract-files: 11.0.0
       graphql: 14.3.1
-      meros: 1.3.0(@types/node@18.16.19)
+      meros: 1.3.0(@types/node@18.18.6)
       tslib: 2.6.0
       value-or-promise: 1.0.12
     transitivePeerDependencies:
@@ -5262,13 +5237,13 @@ packages:
       - supports-color
     dev: true
 
-  /@graphql-tools/github-loader@7.3.28(@babel/core@7.22.8)(@types/node@18.16.19)(graphql@14.3.1):
+  /@graphql-tools/github-loader@7.3.28(@babel/core@7.22.8)(@types/node@18.18.6)(graphql@14.3.1):
     resolution: {integrity: sha512-OK92Lf9pmxPQvjUNv05b3tnVhw0JRfPqOf15jZjyQ8BfdEUrJoP32b4dRQQem/wyRL24KY4wOfArJNqzpsbwCA==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
       '@ardatan/sync-fetch': 0.0.1
-      '@graphql-tools/executor-http': 0.1.10(@types/node@18.16.19)(graphql@14.3.1)
+      '@graphql-tools/executor-http': 0.1.10(@types/node@18.18.6)(graphql@14.3.1)
       '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.22.8)(graphql@14.3.1)
       '@graphql-tools/utils': 9.2.1(graphql@14.3.1)
       '@whatwg-node/fetch': 0.8.8
@@ -5363,15 +5338,15 @@ packages:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
       graphql: 14.3.1
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
-  /@graphql-tools/prisma-loader@7.2.72(@types/node@18.16.19)(graphql@14.3.1):
+  /@graphql-tools/prisma-loader@7.2.72(@types/node@18.18.6)(graphql@14.3.1):
     resolution: {integrity: sha512-0a7uV7Fky6yDqd0tI9+XMuvgIo6GAqiVzzzFV4OSLry4AwiQlI3igYseBV7ZVOGhedOTqj/URxjpiv07hRcwag==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
-      '@graphql-tools/url-loader': 7.17.18(@types/node@18.16.19)(graphql@14.3.1)
+      '@graphql-tools/url-loader': 7.17.18(@types/node@18.18.6)(graphql@14.3.1)
       '@graphql-tools/utils': 9.2.1(graphql@14.3.1)
       '@types/js-yaml': 4.0.5
       '@types/json-stable-stringify': 1.0.34
@@ -5406,7 +5381,7 @@ packages:
       '@ardatan/relay-compiler': 12.0.0(graphql@14.3.1)
       '@graphql-tools/utils': 9.2.1(graphql@14.3.1)
       graphql: 14.3.1
-      tslib: 2.4.1
+      tslib: 2.6.0
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -5424,7 +5399,7 @@ packages:
       value-or-promise: 1.0.12
     dev: true
 
-  /@graphql-tools/url-loader@7.17.18(@types/node@18.16.19)(graphql@14.3.1):
+  /@graphql-tools/url-loader@7.17.18(@types/node@18.18.6)(graphql@14.3.1):
     resolution: {integrity: sha512-ear0CiyTj04jCVAxi7TvgbnGDIN2HgqzXzwsfcqiVg9cvjT40NcMlZ2P1lZDgqMkZ9oyLTV8Bw6j+SyG6A+xPw==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
@@ -5432,7 +5407,7 @@ packages:
       '@ardatan/sync-fetch': 0.0.1
       '@graphql-tools/delegate': 9.0.35(graphql@14.3.1)
       '@graphql-tools/executor-graphql-ws': 0.0.14(graphql@14.3.1)
-      '@graphql-tools/executor-http': 0.1.10(@types/node@18.16.19)(graphql@14.3.1)
+      '@graphql-tools/executor-http': 0.1.10(@types/node@18.18.6)(graphql@14.3.1)
       '@graphql-tools/executor-legacy-ws': 0.0.11(graphql@14.3.1)
       '@graphql-tools/utils': 9.2.1(graphql@14.3.1)
       '@graphql-tools/wrap': 9.4.2(graphql@14.3.1)
@@ -5456,7 +5431,7 @@ packages:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
       graphql: 14.3.1
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /@graphql-tools/utils@9.2.1(graphql@14.3.1):
@@ -5536,7 +5511,7 @@ packages:
     engines: {node: '>= 10.14.2'}
     dependencies:
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       chalk: 4.1.2
       jest-message-util: 26.6.2
       jest-util: 26.6.2
@@ -5629,7 +5604,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       jest-mock: 26.6.2
     dev: true
 
@@ -5639,7 +5614,7 @@ packages:
     dependencies:
       '@jest/types': 26.6.2
       '@sinonjs/fake-timers': 6.0.1
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       jest-message-util: 26.6.2
       jest-mock: 26.6.2
       jest-util: 26.6.2
@@ -5811,7 +5786,7 @@ packages:
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       '@types/yargs': 15.0.15
       chalk: 4.1.2
 
@@ -5822,7 +5797,7 @@ packages:
       '@jest/schemas': 29.6.0
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       '@types/yargs': 17.0.24
       chalk: 4.1.2
     dev: true
@@ -5881,14 +5856,14 @@ packages:
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
     dev: false
 
-  /@kie-tools-core/backend@0.30.0:
-    resolution: {integrity: sha512-lTtIaW2+6Ckc+woZPiXee7QzeWG71eCHoi8JYGFzo7RacjfW6dBI5j8brv0ceLPGNr9V1OCZEgRJRc5DFs4pag==}
+  /@kie-tools-core/backend@0.32.0:
+    resolution: {integrity: sha512-5S/Uq9eXL2pbR9pW3M/X5XsRS2ij38yclrT3oaKh2t89wtv0kh/B5vSG36dtpoSVKtx1+zcyFnBPps+OudXv9Q==}
     dependencies:
-      '@kie-tools-core/i18n': 0.30.0
-      '@kie-tools-core/notifications': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
+      '@kie-tools-core/i18n': 0.32.0
+      '@kie-tools-core/notifications': 0.32.0
+      '@kie-tools-core/workspace': 0.32.0
       axios: 0.21.2(debug@4.3.4)
-      fast-xml-parser: 4.2.5
+      fast-xml-parser: 4.3.2
       portfinder: 1.0.32
       semver: 7.5.4
       sinon: 11.1.2
@@ -5897,18 +5872,18 @@ packages:
       - supports-color
     dev: false
 
-  /@kie-tools-core/editor@0.30.0:
-    resolution: {integrity: sha512-CW4+ApKo1sH5YANDMtOezU3qdqoZHFoFIZmEZQyq1bVnpQO5nYhQR4+Moe3HSo316k3aWRQ7cvog/9MZZvT3eA==}
-    dependencies:
-      '@kie-tools-core/backend': 0.30.0
-      '@kie-tools-core/envelope': 0.30.0
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@kie-tools-core/i18n': 0.30.0
-      '@kie-tools-core/keyboard-shortcuts': 0.30.0
-      '@kie-tools-core/notifications': 0.30.0
-      '@kie-tools-core/operating-system': 0.30.0
-      '@kie-tools-core/patternfly-base': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
+  /@kie-tools-core/editor@0.32.0:
+    resolution: {integrity: sha512-xTWuSln613EtQr4pG20BBFpRDMPzFr9NvG7N0T6qf9lJXr5mGieO+OjIx97oFcgVKxNZlri5FeYvbBDkJcOynA==}
+    dependencies:
+      '@kie-tools-core/backend': 0.32.0
+      '@kie-tools-core/envelope': 0.32.0
+      '@kie-tools-core/envelope-bus': 0.32.0
+      '@kie-tools-core/i18n': 0.32.0
+      '@kie-tools-core/keyboard-shortcuts': 0.32.0
+      '@kie-tools-core/notifications': 0.32.0
+      '@kie-tools-core/operating-system': 0.32.0
+      '@kie-tools-core/patternfly-base': 0.32.0
+      '@kie-tools-core/workspace': 0.32.0
       '@patternfly/react-core': 4.276.8(react-dom@17.0.2)(react@17.0.2)
       '@patternfly/react-icons': 4.93.6(react-dom@17.0.2)(react@17.0.2)
       csstype: 3.1.2
@@ -5920,112 +5895,112 @@ packages:
       - supports-color
     dev: false
 
-  /@kie-tools-core/envelope-bus@0.24.0:
-    resolution: {integrity: sha512-22zMDGwbu2ekBiw1WYpU5GxS0GJLwcNy4Q2LxhhZr3pUbRYo0Bl3/eAlWRG1j8c6ZZNZuS5Oxb+EuYdDJRDJew==}
-    dependencies:
-      react: 17.0.2
-      react-dom: 17.0.2(react@17.0.2)
-    dev: false
-
-  /@kie-tools-core/envelope-bus@0.30.0:
-    resolution: {integrity: sha512-GyrXfByEl3nkDWyy4lb6DfG9ruIStKUm44MLzgniS8jOmykbSHZCPD6Mjl2lV7+xQKY7IrV7umJXUyHfxWVNGw==}
+  /@kie-tools-core/envelope-bus@0.32.0:
+    resolution: {integrity: sha512-vIJrgsy6bWg5266P7hh7KIOE8Ot2rw0LybuKyMPr0w4NTZsdBKrGch0oTQi2rXI0AAnXSyeiQXQeQlTsojPnHQ==}
     dependencies:
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
     dev: false
 
-  /@kie-tools-core/envelope@0.24.0:
-    resolution: {integrity: sha512-P+7NwdAiBm+bfnLzZgBFSNds9kj5TWAuTQ1/f+m3rj1o1uWHp6wJQiUb9NRvAUwnNf0+5VhZJ6eLKjOrgmMqCg==}
+  /@kie-tools-core/envelope@0.32.0:
+    resolution: {integrity: sha512-cGkNQFVTLCgw0Sz4kG0Z31gavy6oB5KeMEHPqxjy4V4XPZpsgAWaO6gtH0arP2ytKTVYWAArV0bKZBJ3YkuxzA==}
     dependencies:
-      '@kie-tools-core/envelope-bus': 0.24.0
+      '@kie-tools-core/envelope-bus': 0.32.0
       csstype: 3.1.2
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
     dev: false
 
-  /@kie-tools-core/envelope@0.30.0:
-    resolution: {integrity: sha512-9a0w8YNFPKMEcl7d+z2c0L88auTzcndUCkN1by9uaE8T+tV9QRdO5TAGQJxGzipAKMdzt1mZ2fCVTRxh1PLucQ==}
+  /@kie-tools-core/i18n@0.32.0:
+    resolution: {integrity: sha512-CxqSdbOIUId6x8Zu06F1ptPHbAmF4ruDsJ0ejFkPhZrxmWYcE9u8AcFKO0mzkbnTvGGTSowTqt1L4ElL2q/rPw==}
     dependencies:
-      '@kie-tools-core/envelope-bus': 0.30.0
-      csstype: 3.1.2
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
     dev: false
 
-  /@kie-tools-core/i18n@0.30.0:
-    resolution: {integrity: sha512-qNUXUNcWXSRABTJQjuw7wudgRG/nzNvTlLR3BMuBrmEcmZPd5PciXPO9/h/dO5lFdQ5x88P3kUqLETkbbzvlUA==}
+  /@kie-tools-core/keyboard-shortcuts@0.32.0:
+    resolution: {integrity: sha512-PKk26OAPnmKi5nokbP1rg8YPv9ym7Afgeg/J+xzHFMXWiz4Nj1zlhWFvfYFfQ9bJPOJcnlj5OYkgYtcmv+OXyA==}
     dependencies:
+      '@kie-tools-core/envelope-bus': 0.32.0
+      '@kie-tools-core/operating-system': 0.32.0
       react: 17.0.2
-      react-dom: 17.0.2(react@17.0.2)
     dev: false
 
-  /@kie-tools-core/keyboard-shortcuts@0.30.0:
-    resolution: {integrity: sha512-L3bTNtpbvLzCawz6dFwXBOjgEdGGzvaOZD1EzdV7ScIhyL2r3BS/pvqz670Fh8UNzx/3ai9HhhP6Kjp8fWz1aQ==}
+  /@kie-tools-core/notifications@0.32.0:
+    resolution: {integrity: sha512-dwUciRAp08Ue8XKwmil87IjC/YcrmlsrebVSN83sRbvl7aXgfFZNgiMl+1uGBzbRovllkzOlKlQYdnBjxlNt0g==}
     dependencies:
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@kie-tools-core/operating-system': 0.30.0
-      react: 17.0.2
+      '@kie-tools-core/i18n': 0.32.0
+      '@kie-tools-core/workspace': 0.32.0
     dev: false
 
-  /@kie-tools-core/notifications@0.30.0:
-    resolution: {integrity: sha512-7V77WtUKTg6BQLOJj26CBFpxqQPMeFSdHHjO9LMMzSTM1nXyfg4MAT6WJ23O6hRG4V4lqSXorfNYq15GA9vXuw==}
-    dependencies:
-      '@kie-tools-core/i18n': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
+  /@kie-tools-core/operating-system@0.32.0:
+    resolution: {integrity: sha512-dG7g+KQsQFYvbwBtDU5RsneIf7KgaHin4C6UIgGXxmjvedX5DbunZT3zc5T8/AidNnydNeeY1ahGt0oyySv4cA==}
     dev: false
 
-  /@kie-tools-core/operating-system@0.30.0:
-    resolution: {integrity: sha512-Q01mUhNhyOuH20LV/coPJicXcd74brvQjwIfMs6gCO/WIbypy22xetUyBxU4xc1IsQSW07wUcsMrlkNTWs6jaw==}
+  /@kie-tools-core/patternfly-base@0.32.0:
+    resolution: {integrity: sha512-tenj2EbcNYxvaJrTfMdZxfgfW3CyCbXQrYKLfxVMgaUD3xihv/Sc4Rl/K8PrY5FBDW7csBXLlI48yzVNX6C3Jw==}
     dev: false
 
-  /@kie-tools-core/patternfly-base@0.30.0:
-    resolution: {integrity: sha512-ru4f6EEaKiaye9lAhohKwT1VlRxBRy/wwgilNBJM9aZEIRmJ8azCTuAjTw+Ej7e0S+71BwxHATwdQJ0NUczA7A==}
+  /@kie-tools-core/vscode-java-code-completion@0.32.0:
+    resolution: {integrity: sha512-Zk8V4OLinc2jvDexLwUl8+oFPauvouhbJ9FpLlAcLY9ebcqC+ecMAf2v8WdrzG/iHKD9nFMaAZbCJDmEpUZMeQ==}
     dev: false
 
-  /@kie-tools-core/vscode-java-code-completion@0.30.0:
-    resolution: {integrity: sha512-IgkBlOY8YeLOrF/Tv0z9HVn6CMe/3xT0u4BeRI64iQ0cZYvaMRj2aNzt7kXH4Uq0vCn71OrlMn0zbPh+pMuw3Q==}
+  /@kie-tools-core/workspace@0.32.0:
+    resolution: {integrity: sha512-Q4Vo4WVIyxXcpGvxecwYrMgDciucsKFK7+5XYRa3tS4JWLAdwKYcG6FwNWnu+MEkafzqXvQYiS0bHwJFYKYt9A==}
+    dependencies:
+      '@kie-tools-core/operating-system': 0.32.0
     dev: false
 
-  /@kie-tools-core/workspace@0.30.0:
-    resolution: {integrity: sha512-Yt6c6mL8OXwiEkyejkDHgPyvtYNEYVcmunnSM+dPLZnaUmUFKrZ66uiAXftx0q5CHYlfJO2W8tq6GYaDiToE+w==}
+  /@kie-tools/dashbuilder-client@0.32.0:
+    resolution: {integrity: sha512-7X3ELTifxzP+fTL5ig2F/6X0Hfx+oI/4vrMUA5/vaDXyV1SJ9hwZztxaGThTzMSMDvDXTY5/8b1GoJMS8PYM1w==}
+    dev: true
+
+  /@kie-tools/dmn-feel-antlr4-parser@0.32.0:
+    resolution: {integrity: sha512-eHEtzwXtTGkDpWzHcG8acjZxVfe0OsIo4MdeRESPiT9r/kHPTz6Cn66cQyIqy6Uvxx2uDKr8koXoQW59TFY94Q==}
     dependencies:
-      '@kie-tools-core/operating-system': 0.30.0
+      '@kie-tools/dmn-marshaller': 0.32.0
+      antlr4: 4.13.1
     dev: false
 
-  /@kie-tools/dashbuilder-client@0.30.0:
-    resolution: {integrity: sha512-1ju8sH0A7f9VdV8v7ffZKzkX3Z7tGMUjmJAVOvTyIyCRQAHNBGiBTGfznfrkjVjny6AFnp+x6SIwrdTlAgw0IA==}
-    dev: true
+  /@kie-tools/dmn-language-service@0.32.0:
+    resolution: {integrity: sha512-pqUgA6k+jvrY5bhPGJBzJUkzGncyBNHbrTUCVZ9efBfwlPhyCEYjUczwkMFvOmTSJl++r7NNlUAcoU12P6Jouw==}
+    dependencies:
+      '@kie-tools/dmn-feel-antlr4-parser': 0.32.0
+      '@kie-tools/dmn-marshaller': 0.32.0
+      antlr4: 4.13.1
+    dev: false
 
-  /@kie-tools/dmn-language-service@0.30.0:
-    resolution: {integrity: sha512-chb3U3/Ipu6F1Ah+iIIgTzCZ8mr1Q9qqjAZvLInxVnla6FaBcGrWGNgHEHJENOa80icsoa7BwBst9G7H1wrxRQ==}
+  /@kie-tools/dmn-marshaller@0.32.0:
+    resolution: {integrity: sha512-9eZgjxnRL72vicCvUSN+NhHY7RxDSzntwaaDT+4ENnJlRX2ZlFmfLvgJ1wGyf+Rjea2zTd6hhRzG+jyYm0Y2pQ==}
+    dependencies:
+      '@kie-tools/xml-parser-ts': 0.32.0
     dev: false
 
-  /@kie-tools/json-yaml-language-service@0.30.0:
-    resolution: {integrity: sha512-SzExbFZkUEZymvO0N/6jzbyCR1AJTsh/XN582ZNdIIAbMFEx/pJlXy179f7VR4vtFByWE60cfdCqXbizM8dI8Q==}
+  /@kie-tools/json-yaml-language-service@0.32.0:
+    resolution: {integrity: sha512-NCHMpPjo4enLaw8zYUQZi8U08+mZqr3h0HERDAcordnkC8cofKt1/wY7e5rYRQnIxd4BHK5QSTh3PPb98XpCJw==}
     dependencies:
-      '@kie-tools/yaml-language-server': 0.30.0
-      jsonata: 1.8.6
+      '@kie-tools/yaml-language-server': 0.32.0
       jsonc-parser: 3.2.0
       vscode-json-languageservice: 4.2.1
       vscode-languageserver: 7.0.0
-      vscode-languageserver-textdocument: 1.0.8
-      vscode-languageserver-types: 3.17.3
+      vscode-languageserver-textdocument: 1.0.11
+      vscode-languageserver-types: 3.17.5
       yaml-language-server-parser: 0.1.3
     dev: false
 
-  /@kie-tools/kie-bc-editors@0.30.0:
-    resolution: {integrity: sha512-+So7zjz+L2iggZO3isCkEmIHYyhjFnMFZb6VxyXqT4/M+rjWyVzxnyOeKf9om2DBVsk68ELqagCxe5q00Iscdg==}
-    dependencies:
-      '@kie-tools-core/editor': 0.30.0
-      '@kie-tools-core/envelope': 0.30.0
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@kie-tools-core/i18n': 0.30.0
-      '@kie-tools-core/notifications': 0.30.0
-      '@kie-tools-core/operating-system': 0.30.0
-      '@kie-tools-core/vscode-java-code-completion': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
-      '@kie-tools/dmn-language-service': 0.30.0
-      '@kie-tools/pmml-editor-marshaller': 0.30.0
+  /@kie-tools/kie-bc-editors@0.32.0:
+    resolution: {integrity: sha512-ciMrDzBr5Bz37IvUPFQM+1jRIll5H+KMTbv93lp1YoQgb006ojimXRJ7WjC6nZLa/B82uWByvWcUtxM+MEB23w==}
+    dependencies:
+      '@kie-tools-core/editor': 0.32.0
+      '@kie-tools-core/envelope': 0.32.0
+      '@kie-tools-core/envelope-bus': 0.32.0
+      '@kie-tools-core/i18n': 0.32.0
+      '@kie-tools-core/notifications': 0.32.0
+      '@kie-tools-core/operating-system': 0.32.0
+      '@kie-tools-core/vscode-java-code-completion': 0.32.0
+      '@kie-tools-core/workspace': 0.32.0
+      '@kie-tools/dmn-language-service': 0.32.0
+      '@kie-tools/pmml-editor-marshaller': 0.32.0
       '@patternfly/react-core': 4.276.8(react-dom@17.0.2)(react@17.0.2)
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
@@ -6034,164 +6009,153 @@ packages:
       - supports-color
     dev: false
 
-  /@kie-tools/kie-editors-standalone@0.30.0:
-    resolution: {integrity: sha512-qI0TvrsSBmRdux5bSnRGE32qSAbl43CIYuXcIcomR6rMpc89tyZQQtFYmqVSSRqiMEpgzi/1jKB4P4MtOEliZw==}
+  /@kie-tools/kie-editors-standalone@0.32.0:
+    resolution: {integrity: sha512-UrnwKau7KC+Onjj6dMyWwC0pdz7J/scWTA/CBDLT3ZPnMdpg6buZcCWH2TLpv7T7CW/tgwbIVelaeyOnLTUd+A==}
+    dependencies:
+      '@kie-tools/kie-bc-editors': 0.32.0
+    transitivePeerDependencies:
+      - debug
+      - supports-color
     dev: false
 
-  /@kie-tools/pmml-editor-marshaller@0.30.0:
-    resolution: {integrity: sha512-uFt+lFn99WEeJi9jVmfJ0yMyVphANCBSFZS32ZKfDdIBME8cnYpAwt0aDjTIm6ytjdCd6oitRNyWvwMlEBgxyw==}
+  /@kie-tools/pmml-editor-marshaller@0.32.0:
+    resolution: {integrity: sha512-/0izm5aUazaM7GNkP0VZooF3pDg3lgOlAaTHx0xjXH1UDq0oFx9JGg7rVvo8j1x2qx2Z0Xm1ohLkZaHYg1obgA==}
     dependencies:
       jsonata: 1.8.6
       xml-js: 1.6.11
     dev: false
 
-  /@kie-tools/serverless-workflow-combined-editor@0.30.0:
-    resolution: {integrity: sha512-AU0RNZ1IhhdT/aDxyXaTLjsE24vrKCchQ6PcbOgNf5nPuMFV7/EM3h5V9JZN12/u8HCxa4Kc1xrgfHyIFgjcjQ==}
-    dependencies:
-      '@kie-tools-core/editor': 0.30.0
-      '@kie-tools-core/envelope': 0.30.0
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@kie-tools-core/keyboard-shortcuts': 0.30.0
-      '@kie-tools-core/notifications': 0.30.0
-      '@kie-tools-core/operating-system': 0.30.0
-      '@kie-tools-core/patternfly-base': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
-      '@kie-tools/serverless-workflow-diagram-editor-assets': 0.30.0
-      '@kie-tools/serverless-workflow-diagram-editor-envelope': 0.30.0
-      '@kie-tools/serverless-workflow-language-service': 0.30.0
-      '@kie-tools/serverless-workflow-mermaid-viewer': 0.30.0
-      '@kie-tools/serverless-workflow-service-catalog': 0.30.0
-      '@kie-tools/serverless-workflow-text-editor': 0.30.0
+  /@kie-tools/serverless-workflow-combined-editor@0.32.0:
+    resolution: {integrity: sha512-MYXMHqQqZF25b9KCMPZKxKY9tzp1CVQksbwq4lI3V5TqEBMaMHwml/bHzRxnTrZMRMIRLtTAo+XiXk14zwUgnw==}
+    dependencies:
+      '@kie-tools-core/editor': 0.32.0
+      '@kie-tools-core/envelope': 0.32.0
+      '@kie-tools-core/envelope-bus': 0.32.0
+      '@kie-tools-core/keyboard-shortcuts': 0.32.0
+      '@kie-tools-core/notifications': 0.32.0
+      '@kie-tools-core/operating-system': 0.32.0
+      '@kie-tools-core/patternfly-base': 0.32.0
+      '@kie-tools-core/workspace': 0.32.0
+      '@kie-tools/serverless-workflow-diagram-editor-assets': 0.32.0
+      '@kie-tools/serverless-workflow-diagram-editor-envelope': 0.32.0
+      '@kie-tools/serverless-workflow-language-service': 0.32.0
+      '@kie-tools/serverless-workflow-service-catalog': 0.32.0
+      '@kie-tools/serverless-workflow-text-editor': 0.32.0
       '@patternfly/react-core': 4.276.8(react-dom@17.0.2)(react@17.0.2)
       '@patternfly/react-icons': 4.93.6(react-dom@17.0.2)(react@17.0.2)
       json-schema: 0.4.0
-      monaco-editor: 0.33.0
-      monaco-yaml: 4.0.4(monaco-editor@0.33.0)
+      monaco-editor: 0.39.0
+      monaco-yaml: 4.0.4(monaco-editor@0.39.0)
+      path-browserify: 1.0.1
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
-      vscode-languageserver-types: 3.17.3
+      vscode-languageserver-types: 3.17.5
     transitivePeerDependencies:
       - debug
       - encoding
       - supports-color
     dev: false
 
-  /@kie-tools/serverless-workflow-diagram-editor-assets@0.30.0:
-    resolution: {integrity: sha512-ck2pN0XC4fyZF4K5uNoLPx6x2niycp3xYS+6P4J5V1XyWQtO9n6Q8GIeOJUcX8IvEfcoz4g3757ls3munla1fw==}
+  /@kie-tools/serverless-workflow-diagram-editor-assets@0.32.0:
+    resolution: {integrity: sha512-iMlsg1Oektc1IRmOglUSQslxVkvUMYIB9qC4HhywffiCaBR8pwTjFWVbMiOxG5fkmcf6JAUcpqUaWJauPIVu2g==}
     dev: false
 
-  /@kie-tools/serverless-workflow-diagram-editor-envelope@0.30.0:
-    resolution: {integrity: sha512-jpfdNKX2x6mQpCBKZvNh2HZppHFbEUsWyLVKjLz0250EmoiZyM07i2svpG0XR4xifD++jnRu6CLy9wF4cnXAqw==}
-    dependencies:
-      '@kie-tools-core/editor': 0.30.0
-      '@kie-tools-core/envelope': 0.30.0
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@kie-tools-core/i18n': 0.30.0
-      '@kie-tools-core/notifications': 0.30.0
-      '@kie-tools-core/operating-system': 0.30.0
-      '@kie-tools-core/vscode-java-code-completion': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
-      '@kie-tools/kie-bc-editors': 0.30.0
+  /@kie-tools/serverless-workflow-diagram-editor-envelope@0.32.0:
+    resolution: {integrity: sha512-4KupBZ/UGPFWba61/lVXhdKWTEaFccVrsMhw1c136TPnm9ie7UBBqBV9fmRqjsv5q5t27y6oRHQGy+jXy6Fmyw==}
+    dependencies:
+      '@kie-tools-core/editor': 0.32.0
+      '@kie-tools-core/envelope': 0.32.0
+      '@kie-tools-core/envelope-bus': 0.32.0
+      '@kie-tools-core/i18n': 0.32.0
+      '@kie-tools-core/notifications': 0.32.0
+      '@kie-tools-core/operating-system': 0.32.0
+      '@kie-tools-core/vscode-java-code-completion': 0.32.0
+      '@kie-tools-core/workspace': 0.32.0
+      '@kie-tools/kie-bc-editors': 0.32.0
     transitivePeerDependencies:
       - debug
       - supports-color
     dev: false
 
-  /@kie-tools/serverless-workflow-jq-expressions@0.30.0:
-    resolution: {integrity: sha512-DfyygW4IKmooWIWYgZB+CTEY1aV8sytcQFr/vf+uHZN4yVAHv0YiXrdElhdAhwjcGwthLfgfsKA3cJHB3YQi7A==}
+  /@kie-tools/serverless-workflow-jq-expressions@0.32.0:
+    resolution: {integrity: sha512-6tMA8vW0a7FTU4puSobLhyYGMWCNEjdxZQmTVqKYnlvWJA0Xd98ckiQ9XV0wWU5s736tZtFxZU13Za1ukMxVlA==}
     dependencies:
-      '@kie-tools/serverless-workflow-service-catalog': 0.30.0
+      '@kie-tools/serverless-workflow-service-catalog': 0.32.0
       cross-fetch: 3.1.8
     transitivePeerDependencies:
       - encoding
     dev: false
 
-  /@kie-tools/serverless-workflow-language-service@0.30.0:
-    resolution: {integrity: sha512-pYwT6l4RElGpLe/Efx0GNxiDiukBhL/cwR6M8Kqgsncipcf0RoG5LiPB7ihmnZPUsFR9SoJJe5YuSp8CnT17Aw==}
+  /@kie-tools/serverless-workflow-language-service@0.32.0:
+    resolution: {integrity: sha512-kW0zKJxbxok2WY2qeJpnaSzpkGtleMwgNCirVIMp4GB+ql8hHVXzKGXBImUpFFmwcARml7MlhWjUz7CLnPv8Cg==}
     dependencies:
-      '@kie-tools/json-yaml-language-service': 0.30.0
-      '@kie-tools/serverless-workflow-jq-expressions': 0.30.0
-      '@kie-tools/serverless-workflow-service-catalog': 0.30.0
-      '@kie-tools/yaml-language-server': 0.30.0
+      '@kie-tools/json-yaml-language-service': 0.32.0
+      '@kie-tools/serverless-workflow-jq-expressions': 0.32.0
+      '@kie-tools/serverless-workflow-service-catalog': 0.32.0
+      '@kie-tools/yaml-language-server': 0.32.0
       '@severlessworkflow/sdk-typescript': 3.0.3
       json-to-ast: 2.1.0
       jsonata: 1.8.6
       jsonc-parser: 3.2.0
+      path-browserify: 1.0.1
       vscode-json-languageservice: 4.2.1
       vscode-languageserver: 7.0.0
-      vscode-languageserver-textdocument: 1.0.8
-      vscode-languageserver-types: 3.17.3
+      vscode-languageserver-textdocument: 1.0.11
+      vscode-languageserver-types: 3.17.5
       yaml-language-server-parser: 0.1.3
     transitivePeerDependencies:
       - encoding
     dev: false
 
-  /@kie-tools/serverless-workflow-mermaid-viewer@0.30.0:
-    resolution: {integrity: sha512-t8KNJCsVKOzPYi6wQNnHK5QYuxZiK/rjFpI3DmNCCJpVcRft9VCI6mHluPE+Snl82ExPl2dl7R65iZwTn+2DBg==}
-    dependencies:
-      '@kie-tools-core/editor': 0.30.0
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@kie-tools-core/keyboard-shortcuts': 0.30.0
-      '@kie-tools-core/notifications': 0.30.0
-      '@kie-tools-core/operating-system': 0.30.0
-      '@kie-tools-core/patternfly-base': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
-      '@patternfly/react-core': 4.276.8(react-dom@17.0.2)(react@17.0.2)
-      '@patternfly/react-icons': 4.93.6(react-dom@17.0.2)(react@17.0.2)
-      '@severlessworkflow/sdk-typescript': 3.0.3
-      mermaid: 9.4.3
-      react: 17.0.2
-      react-dom: 17.0.2(react@17.0.2)
-      svg-pan-zoom: 3.6.1
-    transitivePeerDependencies:
-      - debug
-      - supports-color
-    dev: false
-
-  /@kie-tools/serverless-workflow-service-catalog@0.30.0:
-    resolution: {integrity: sha512-JSaxffHFCz5/g2EBDOWfSJFStWp6JslsI8jDijEVOLuqUA4Ma0b7TYNIQ4gSmRuhiYwJdSXyii1OsZa6pwtimw==}
+  /@kie-tools/serverless-workflow-service-catalog@0.32.0:
+    resolution: {integrity: sha512-INwL4tjLTs6if34BWHnAwrFYWBMe9jYfki7PIV/JhE6WX1G4h0POrK90KhDwmL1GpyUjqBlQTbzSkk2fxLFEKQ==}
     dependencies:
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@types/js-yaml': 4.0.5
+      '@kie-tools-core/envelope-bus': 0.32.0
+      '@types/js-yaml': 4.0.8
       js-yaml: 4.1.0
       lodash: 4.17.21
       openapi-types: 7.2.3
+      path-browserify: 1.0.1
     dev: false
 
-  /@kie-tools/serverless-workflow-text-editor@0.30.0:
-    resolution: {integrity: sha512-25nbEEDadl1qYUS9zCf86UA5jhjCN5eHxbvSxWUjGtluIlbdhP172GruM4og5TD/LHh9BRgfdJDUcdJLNFeP+Q==}
-    dependencies:
-      '@kie-tools-core/editor': 0.30.0
-      '@kie-tools-core/envelope': 0.30.0
-      '@kie-tools-core/envelope-bus': 0.30.0
-      '@kie-tools-core/notifications': 0.30.0
-      '@kie-tools-core/operating-system': 0.30.0
-      '@kie-tools-core/patternfly-base': 0.30.0
-      '@kie-tools-core/workspace': 0.30.0
-      '@kie-tools/serverless-workflow-language-service': 0.30.0
-      '@kie-tools/serverless-workflow-service-catalog': 0.30.0
+  /@kie-tools/serverless-workflow-text-editor@0.32.0:
+    resolution: {integrity: sha512-3//LVxU4nE09MMv+0GitblBf6LIBkVpQ5asYrjZTP5jsUy8BznX+tvGZKlgryByGD2SVI6Yfl/npWyC8n19mSQ==}
+    dependencies:
+      '@kie-tools-core/editor': 0.32.0
+      '@kie-tools-core/envelope': 0.32.0
+      '@kie-tools-core/envelope-bus': 0.32.0
+      '@kie-tools-core/notifications': 0.32.0
+      '@kie-tools-core/operating-system': 0.32.0
+      '@kie-tools-core/patternfly-base': 0.32.0
+      '@kie-tools-core/workspace': 0.32.0
+      '@kie-tools/serverless-workflow-language-service': 0.32.0
+      '@kie-tools/serverless-workflow-service-catalog': 0.32.0
       '@patternfly/react-core': 4.276.8(react-dom@17.0.2)(react@17.0.2)
       '@patternfly/react-icons': 4.93.6(react-dom@17.0.2)(react@17.0.2)
       json-schema: 0.4.0
-      monaco-editor: 0.33.0
-      monaco-yaml: 4.0.4(monaco-editor@0.33.0)
+      monaco-editor: 0.39.0
+      monaco-yaml: 4.0.4(monaco-editor@0.39.0)
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
-      vscode-languageserver-types: 3.17.3
+      vscode-languageserver-types: 3.17.5
     transitivePeerDependencies:
       - debug
       - encoding
       - supports-color
     dev: false
 
-  /@kie-tools/yaml-language-server@0.30.0:
-    resolution: {integrity: sha512-zOt02iqxESnv2FU35xU0eRKDfIcRT3ySvRtcCQ+NxL9wSWy+EgYuXaj9IC/lHMpG29aTWt53DxCZ625B1IrA/w==}
+  /@kie-tools/xml-parser-ts@0.32.0:
+    resolution: {integrity: sha512-AfPSvvy3jAdneBJrGAdxU7jp1XAh3vhWmA//5Qc0PPVd509AqCl0vfEHiJVTNAMo1VY2L1FDzdmq7Z+cKMHleA==}
+    dev: false
+
+  /@kie-tools/yaml-language-server@0.32.0:
+    resolution: {integrity: sha512-M9TpJke1M2LLQxQQ0X27XTjwNDgNcIBwcDQKTH2TJFVqOLj5Y82QqqROC9QpunmaKdQ7GN62mWvL4ug31YV6Jw==}
     dependencies:
       path-browserify: 1.0.1
       vscode-json-languageservice: 4.2.1
       vscode-languageserver: 7.0.0
-      vscode-languageserver-textdocument: 1.0.8
-      vscode-languageserver-types: 3.17.3
+      vscode-languageserver-textdocument: 1.0.11
+      vscode-languageserver-types: 3.17.5
     dev: false
 
   /@kie/lock-treatment-tool@0.2.4:
@@ -6206,14 +6170,6 @@ packages:
   /@leichtgewicht/ip-codec@2.0.4:
     resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==}
 
-  /@mrmlnc/readdir-enhanced@2.2.1:
-    resolution: {integrity: sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==}
-    engines: {node: '>=4'}
-    dependencies:
-      call-me-maybe: 1.0.2
-      glob-to-regexp: 0.3.0
-    dev: true
-
   /@nicolo-ribaudo/semver-v6@6.3.3:
     resolution: {integrity: sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==}
     hasBin: true
@@ -6227,11 +6183,6 @@ packages:
       run-parallel: 1.2.0
     dev: true
 
-  /@nodelib/fs.stat@1.1.3:
-    resolution: {integrity: sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==}
-    engines: {node: '>= 6'}
-    dev: true
-
   /@nodelib/fs.stat@2.0.5:
     resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
     engines: {node: '>= 8'}
@@ -6295,12 +6246,12 @@ packages:
       victory-zoom-container: 36.6.11(react@17.0.2)
     dev: false
 
-  /@patternfly/react-code-editor@4.82.113(react-dom@17.0.2)(react-monaco-editor@0.49.0)(react@17.0.2):
+  /@patternfly/react-code-editor@4.82.113(react-dom@17.0.2)(react-monaco-editor@0.54.0)(react@17.0.2):
     resolution: {integrity: sha512-iBwDTuUifwUwwL4wAzpI4KkB5fkCxiPVGlUypWumtNXweVf3x6PWpLCJM2H1rhNUddBRWIj5JOL3DYqPqYpbZg==}
     peerDependencies:
       react: ^16.8 || ^17 || ^18
       react-dom: ^16.8 || ^17 || ^18
-      react-monaco-editor: ^0.51.0
+      react-monaco-editor: ^0.54.0
     dependencies:
       '@patternfly/react-core': 4.276.8(react-dom@17.0.2)(react@17.0.2)
       '@patternfly/react-icons': 4.93.6(react-dom@17.0.2)(react@17.0.2)
@@ -6308,7 +6259,7 @@ packages:
       react: 17.0.2
       react-dom: 17.0.2(react@17.0.2)
       react-dropzone: 9.0.0(react@17.0.2)
-      react-monaco-editor: 0.49.0(@types/react@17.0.5)(monaco-editor@0.33.0)(react@17.0.2)
+      react-monaco-editor: 0.54.0(@types/react@17.0.5)(monaco-editor@0.39.0)(react@17.0.2)
       tslib: 2.6.0
     dev: false
 
@@ -6683,7 +6634,7 @@ packages:
   /@types/connect@3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
 
   /@types/content-disposition@0.5.5:
     resolution: {integrity: sha512-v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA==}
@@ -6695,7 +6646,7 @@ packages:
       '@types/connect': 3.4.35
       '@types/express': 4.17.17
       '@types/keygrip': 1.0.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/cors@2.8.10:
@@ -6761,7 +6712,7 @@ packages:
     resolution: {integrity: sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw==}
     dependencies:
       '@types/estree': 1.0.1
-      '@types/json-schema': 7.0.12
+      '@types/json-schema': 7.0.7
 
   /@types/estree@1.0.1:
     resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==}
@@ -6785,20 +6736,13 @@ packages:
   /@types/fs-capacitor@2.0.0:
     resolution: {integrity: sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==}
     dependencies:
-      '@types/node': 20.4.1
-    dev: true
-
-  /@types/glob@7.2.0:
-    resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
-    dependencies:
-      '@types/minimatch': 3.0.5
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/history@4.7.11:
@@ -6819,7 +6763,7 @@ packages:
   /@types/http-proxy@1.17.11:
     resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
 
   /@types/istanbul-lib-coverage@2.0.4:
     resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
@@ -6850,6 +6794,11 @@ packages:
 
   /@types/js-yaml@4.0.5:
     resolution: {integrity: sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==}
+    dev: true
+
+  /@types/js-yaml@4.0.8:
+    resolution: {integrity: sha512-m6jnPk1VhlYRiLFm3f8X9Uep761f+CK8mHyS65LutH2OhmBF0BeMEjHgg05usH8PLZMWWc/BUR9RPmkvpWnyRA==}
+    dev: false
 
   /@types/json-schema@7.0.12:
     resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
@@ -6872,7 +6821,7 @@ packages:
   /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/koa-compose@3.2.5:
@@ -6891,7 +6840,7 @@ packages:
       '@types/http-errors': 2.0.1
       '@types/keygrip': 1.0.2
       '@types/koa-compose': 3.2.5
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/long@4.0.2:
@@ -6918,6 +6867,9 @@ packages:
 
   /@types/node@18.16.19:
     resolution: {integrity: sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==}
+
+  /@types/node@18.18.6:
+    resolution: {integrity: sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==}
     dev: true
 
   /@types/node@20.4.1:
@@ -6997,13 +6949,13 @@ packages:
   /@types/readdir-glob@1.1.1:
     resolution: {integrity: sha512-ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/retry@0.12.0:
@@ -7016,7 +6968,7 @@ packages:
     resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
     dependencies:
       '@types/mime': 1.3.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
 
   /@types/serve-index@1.9.1:
     resolution: {integrity: sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==}
@@ -7095,7 +7047,7 @@ packages:
   /@types/ws@7.4.7:
     resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /@types/ws@8.5.5:
@@ -7117,11 +7069,11 @@ packages:
       '@types/yargs-parser': 21.0.0
     dev: true
 
-  /@types/yauzl@2.10.0:
-    resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
+  /@types/yauzl@2.10.2:
+    resolution: {integrity: sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
     optional: true
 
@@ -7362,11 +7314,11 @@ packages:
     resolution: {integrity: sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA==}
     dev: true
 
-  /@whatwg-node/fetch@0.6.9(@types/node@18.16.19):
+  /@whatwg-node/fetch@0.6.9(@types/node@18.18.6):
     resolution: {integrity: sha512-JfrBCJdMu9n9OARc0e/hPHcD98/8Nz1CKSdGYDg6VbObDkV/Ys30xe5i/wPOatYbxuvatj1kfWeHf7iNX3i17w==}
     dependencies:
       '@peculiar/webcrypto': 1.4.3
-      '@whatwg-node/node-fetch': 0.0.5(@types/node@18.16.19)
+      '@whatwg-node/node-fetch': 0.0.5(@types/node@18.18.6)
       busboy: 1.6.0
       urlpattern-polyfill: 6.0.2
       web-streams-polyfill: 3.2.1
@@ -7384,12 +7336,12 @@ packages:
       web-streams-polyfill: 3.2.1
     dev: true
 
-  /@whatwg-node/node-fetch@0.0.5(@types/node@18.16.19):
+  /@whatwg-node/node-fetch@0.0.5(@types/node@18.18.6):
     resolution: {integrity: sha512-hbccmaSZaItdsRuBKBEEhLoO+5oXJPxiyd0kG2xXd0Dh3Rt+vZn4pADHxuSiSHLd9CM+S2z4+IxlEGbWUgiz9g==}
     peerDependencies:
       '@types/node': ^18.0.6
     dependencies:
-      '@types/node': 18.16.19
+      '@types/node': 18.18.6
       '@whatwg-node/events': 0.0.2
       busboy: 1.6.0
       tslib: 2.6.0
@@ -7442,7 +7394,7 @@ packages:
   /@wry/context@0.4.4:
     resolution: {integrity: sha512-LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag==}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       tslib: 1.14.1
 
   /@wry/equality@0.1.11:
@@ -7662,6 +7614,11 @@ packages:
     dependencies:
       color-convert: 2.0.1
 
+  /antlr4@4.13.1:
+    resolution: {integrity: sha512-kiXTspaRYvnIArgE97z5YVVf/cDVQABr3abFRR6mE7yesLMkgu4ujuyV/sgxafQ8wgve0DJQUJ38Z8tkgA2izA==}
+    engines: {node: '>=16'}
+    dev: false
+
   /anymatch@2.0.0:
     resolution: {integrity: sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==}
     dependencies:
@@ -8090,23 +8047,11 @@ packages:
       is-string: 1.0.7
     dev: true
 
-  /array-union@1.0.2:
-    resolution: {integrity: sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      array-uniq: 1.0.3
-    dev: true
-
   /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
     dev: true
 
-  /array-uniq@1.0.3:
-    resolution: {integrity: sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /array-unique@0.3.2:
     resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
     engines: {node: '>=0.10.0'}
@@ -8924,6 +8869,7 @@ packages:
 
   /call-me-maybe@1.0.2:
     resolution: {integrity: sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==}
+    dev: false
 
   /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
@@ -8967,7 +8913,7 @@ packages:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -9058,7 +9004,7 @@ packages:
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /char-regex@1.0.2:
@@ -9111,7 +9057,7 @@ packages:
       normalize-path: 3.0.0
       readdirp: 3.6.0
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
 
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
@@ -9448,7 +9394,7 @@ packages:
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
       upper-case: 2.0.2
     dev: true
 
@@ -9558,19 +9504,7 @@ packages:
       vary: 1.1.2
     dev: true
 
-  /cose-base@1.0.3:
-    resolution: {integrity: sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==}
-    dependencies:
-      layout-base: 1.0.2
-    dev: false
-
-  /cose-base@2.2.0:
-    resolution: {integrity: sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==}
-    dependencies:
-      layout-base: 2.0.1
-    dev: false
-
-  /cosmiconfig-typescript-loader@4.3.0(@types/node@18.16.19)(cosmiconfig@7.1.0)(ts-node@10.9.1)(typescript@4.9.5):
+  /cosmiconfig-typescript-loader@4.3.0(@types/node@18.18.6)(cosmiconfig@7.1.0)(ts-node@10.9.1)(typescript@4.9.5):
     resolution: {integrity: sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
@@ -9579,9 +9513,9 @@ packages:
       ts-node: '>=10'
       typescript: '>=3'
     dependencies:
-      '@types/node': 18.16.19
+      '@types/node': 18.18.6
       cosmiconfig: 7.1.0
-      ts-node: 10.9.1(@types/node@18.16.19)(typescript@4.9.5)
+      ts-node: 10.9.1(@types/node@18.18.6)(typescript@4.9.5)
       typescript: 4.9.5
     dev: true
 
@@ -9617,33 +9551,6 @@ packages:
       path-type: 4.0.0
     dev: true
 
-  /cp-file@7.0.0:
-    resolution: {integrity: sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==}
-    engines: {node: '>=8'}
-    dependencies:
-      graceful-fs: 4.2.11
-      make-dir: 3.1.0
-      nested-error-stacks: 2.1.1
-      p-event: 4.2.0
-    dev: true
-
-  /cpy@8.1.2:
-    resolution: {integrity: sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==}
-    engines: {node: '>=8'}
-    dependencies:
-      arrify: 2.0.1
-      cp-file: 7.0.0
-      globby: 9.2.0
-      has-glob: 1.0.0
-      junk: 3.1.0
-      nested-error-stacks: 2.1.1
-      p-all: 2.1.0
-      p-filter: 2.1.0
-      p-map: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /crc-32@1.2.2:
     resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
     engines: {node: '>=0.8'}
@@ -9711,7 +9618,7 @@ packages:
     dependencies:
       nice-try: 1.0.5
       path-key: 2.0.1
-      semver: 5.7.1
+      semver: 5.7.2
       shebang-command: 1.2.0
       which: 1.3.1
     dev: true
@@ -10003,32 +9910,6 @@ packages:
       yauzl: 2.10.0
     dev: true
 
-  /cytoscape-cose-bilkent@4.1.0(cytoscape@3.25.0):
-    resolution: {integrity: sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==}
-    peerDependencies:
-      cytoscape: ^3.2.0
-    dependencies:
-      cose-base: 1.0.3
-      cytoscape: 3.25.0
-    dev: false
-
-  /cytoscape-fcose@2.2.0(cytoscape@3.25.0):
-    resolution: {integrity: sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==}
-    peerDependencies:
-      cytoscape: ^3.2.0
-    dependencies:
-      cose-base: 2.2.0
-      cytoscape: 3.25.0
-    dev: false
-
-  /cytoscape@3.25.0:
-    resolution: {integrity: sha512-7MW3Iz57mCUo6JQCho6CmPBCbTlJr7LzyEtIkutG255HLVd4XuBg2I9BkTZLI/e4HoaOB/BiAzXuQybQ95+r9Q==}
-    engines: {node: '>=0.10'}
-    dependencies:
-      heap: 0.2.7
-      lodash: 4.17.21
-    dev: false
-
   /d3-array@3.2.4:
     resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
     engines: {node: '>=12'}
@@ -10036,109 +9917,21 @@ packages:
       internmap: 2.0.3
     dev: false
 
-  /d3-axis@3.0.0:
-    resolution: {integrity: sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /d3-brush@3.0.0:
-    resolution: {integrity: sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-dispatch: 3.0.1
-      d3-drag: 3.0.0
-      d3-interpolate: 3.0.1
-      d3-selection: 3.0.0
-      d3-transition: 3.0.1(d3-selection@3.0.0)
-    dev: false
-
-  /d3-chord@3.0.1:
-    resolution: {integrity: sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-path: 3.1.0
-    dev: false
-
   /d3-color@3.1.0:
     resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
     engines: {node: '>=12'}
     dev: false
 
-  /d3-contour@4.0.2:
-    resolution: {integrity: sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-array: 3.2.4
-    dev: false
-
-  /d3-delaunay@6.0.4:
-    resolution: {integrity: sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==}
-    engines: {node: '>=12'}
-    dependencies:
-      delaunator: 5.0.0
-    dev: false
-
-  /d3-dispatch@3.0.1:
-    resolution: {integrity: sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /d3-drag@3.0.0:
-    resolution: {integrity: sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-dispatch: 3.0.1
-      d3-selection: 3.0.0
-    dev: false
-
-  /d3-dsv@3.0.1:
-    resolution: {integrity: sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==}
-    engines: {node: '>=12'}
-    hasBin: true
-    dependencies:
-      commander: 7.2.0
-      iconv-lite: 0.6.3
-      rw: 1.3.3
-    dev: false
-
   /d3-ease@3.0.1:
     resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
     engines: {node: '>=12'}
     dev: false
 
-  /d3-fetch@3.0.1:
-    resolution: {integrity: sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-dsv: 3.0.1
-    dev: false
-
-  /d3-force@3.0.0:
-    resolution: {integrity: sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-dispatch: 3.0.1
-      d3-quadtree: 3.0.1
-      d3-timer: 3.0.1
-    dev: false
-
   /d3-format@3.1.0:
     resolution: {integrity: sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==}
     engines: {node: '>=12'}
     dev: false
 
-  /d3-geo@3.1.0:
-    resolution: {integrity: sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-array: 3.2.4
-    dev: false
-
-  /d3-hierarchy@3.1.2:
-    resolution: {integrity: sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==}
-    engines: {node: '>=12'}
-    dev: false
-
   /d3-interpolate@3.0.1:
     resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
     engines: {node: '>=12'}
@@ -10151,29 +9944,6 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
-  /d3-polygon@3.0.1:
-    resolution: {integrity: sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /d3-quadtree@3.0.1:
-    resolution: {integrity: sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /d3-random@3.0.1:
-    resolution: {integrity: sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==}
-    engines: {node: '>=12'}
-    dev: false
-
-  /d3-scale-chromatic@3.0.0:
-    resolution: {integrity: sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-color: 3.1.0
-      d3-interpolate: 3.0.1
-    dev: false
-
   /d3-scale@4.0.2:
     resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
     engines: {node: '>=12'}
@@ -10185,11 +9955,6 @@ packages:
       d3-time-format: 4.1.0
     dev: false
 
-  /d3-selection@3.0.0:
-    resolution: {integrity: sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==}
-    engines: {node: '>=12'}
-    dev: false
-
   /d3-shape@3.2.0:
     resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
     engines: {node: '>=12'}
@@ -10220,81 +9985,13 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
-  /d3-transition@3.0.1(d3-selection@3.0.0):
-    resolution: {integrity: sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==}
-    engines: {node: '>=12'}
+  /dangerously-set-html-content@1.0.13(react@17.0.2):
+    resolution: {integrity: sha512-C/6Rm8L3BgjFX0ugETpWS3MyrRqTycVbqlSKDhqeoMaZAfCw2Xx1qcj4CYGnZnn61tCJ3JZdHnWCcNEXvhh4sA==}
+    engines: {node: '>=10'}
     peerDependencies:
-      d3-selection: 2 - 3
+      react: ^18.2.0
     dependencies:
-      d3-color: 3.1.0
-      d3-dispatch: 3.0.1
-      d3-ease: 3.0.1
-      d3-interpolate: 3.0.1
-      d3-selection: 3.0.0
-      d3-timer: 3.0.1
-    dev: false
-
-  /d3-zoom@3.0.0:
-    resolution: {integrity: sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-dispatch: 3.0.1
-      d3-drag: 3.0.0
-      d3-interpolate: 3.0.1
-      d3-selection: 3.0.0
-      d3-transition: 3.0.1(d3-selection@3.0.0)
-    dev: false
-
-  /d3@7.8.5:
-    resolution: {integrity: sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==}
-    engines: {node: '>=12'}
-    dependencies:
-      d3-array: 3.2.4
-      d3-axis: 3.0.0
-      d3-brush: 3.0.0
-      d3-chord: 3.0.1
-      d3-color: 3.1.0
-      d3-contour: 4.0.2
-      d3-delaunay: 6.0.4
-      d3-dispatch: 3.0.1
-      d3-drag: 3.0.0
-      d3-dsv: 3.0.1
-      d3-ease: 3.0.1
-      d3-fetch: 3.0.1
-      d3-force: 3.0.0
-      d3-format: 3.1.0
-      d3-geo: 3.1.0
-      d3-hierarchy: 3.1.2
-      d3-interpolate: 3.0.1
-      d3-path: 3.1.0
-      d3-polygon: 3.0.1
-      d3-quadtree: 3.0.1
-      d3-random: 3.0.1
-      d3-scale: 4.0.2
-      d3-scale-chromatic: 3.0.0
-      d3-selection: 3.0.0
-      d3-shape: 3.2.0
-      d3-time: 3.1.0
-      d3-time-format: 4.1.0
-      d3-timer: 3.0.1
-      d3-transition: 3.0.1(d3-selection@3.0.0)
-      d3-zoom: 3.0.0
-    dev: false
-
-  /dagre-d3-es@7.0.9:
-    resolution: {integrity: sha512-rYR4QfVmy+sR44IBDvVtcAmOReGBvRCWDpO2QjYwqgh9yijw6eSHBqaPG/LIOEy7aBsniLvtMW6pg19qJhq60w==}
-    dependencies:
-      d3: 7.8.5
-      lodash-es: 4.17.21
-    dev: false
-
-  /dangerously-set-html-content@1.0.13(react@17.0.2):
-    resolution: {integrity: sha512-C/6Rm8L3BgjFX0ugETpWS3MyrRqTycVbqlSKDhqeoMaZAfCw2Xx1qcj4CYGnZnn61tCJ3JZdHnWCcNEXvhh4sA==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      react: ^18.2.0
-    dependencies:
-      react: 17.0.2
+      react: 17.0.2
     dev: false
 
   /dashdash@1.14.1:
@@ -10325,6 +10022,7 @@ packages:
 
   /dayjs@1.11.9:
     resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==}
+    dev: true
 
   /debounce@1.2.1:
     resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
@@ -10418,6 +10116,7 @@ packages:
 
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+    dev: true
 
   /deepmerge@4.3.1:
     resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
@@ -10492,12 +10191,6 @@ packages:
     resolution: {integrity: sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag==}
     dev: false
 
-  /delaunator@5.0.0:
-    resolution: {integrity: sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==}
-    dependencies:
-      robust-predicates: 3.0.2
-    dev: false
-
   /delaunay-find@0.0.6:
     resolution: {integrity: sha512-1+almjfrnR7ZamBk0q3Nhg6lqSe6Le4vL0WJDSMx4IDbQwTpUTXPjxC00lqLBT8MYsJpPCbI16sIkw9cPsbi7Q==}
     dependencies:
@@ -10589,13 +10282,6 @@ packages:
       randombytes: 2.1.0
     dev: true
 
-  /dir-glob@2.2.2:
-    resolution: {integrity: sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==}
-    engines: {node: '>=4'}
-    dependencies:
-      path-type: 3.0.0
-    dev: true
-
   /dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
@@ -10693,10 +10379,6 @@ packages:
       domelementtype: 2.3.0
     dev: true
 
-  /dompurify@2.4.3:
-    resolution: {integrity: sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==}
-    dev: false
-
   /domutils@2.8.0:
     resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
     dependencies:
@@ -10717,7 +10399,7 @@ packages:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /dot-prop@5.3.0:
@@ -10758,10 +10440,6 @@ packages:
   /electron-to-chromium@1.4.454:
     resolution: {integrity: sha512-pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ==}
 
-  /elkjs@0.8.2:
-    resolution: {integrity: sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==}
-    dev: false
-
   /elliptic@6.5.4:
     resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==}
     dependencies:
@@ -10989,19 +10667,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /escodegen@1.14.3:
-    resolution: {integrity: sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==}
-    engines: {node: '>=4.0'}
-    hasBin: true
-    dependencies:
-      esprima: 4.0.1
-      estraverse: 4.3.0
-      esutils: 2.0.3
-      optionator: 0.8.3
-    optionalDependencies:
-      source-map: 0.6.1
-    dev: false
-
   /escodegen@2.1.0:
     resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
     engines: {node: '>=6.0'}
@@ -11175,12 +10840,6 @@ packages:
       eslint-visitor-keys: 1.3.0
     dev: true
 
-  /esprima@1.2.2:
-    resolution: {integrity: sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: false
-
   /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
@@ -11210,6 +10869,7 @@ packages:
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /etag@1.8.1:
     resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
@@ -11461,7 +11121,7 @@ packages:
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
-      '@types/yauzl': 2.10.0
+      '@types/yauzl': 2.10.2
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11486,20 +11146,6 @@ packages:
     resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
     dev: true
 
-  /fast-glob@2.2.7:
-    resolution: {integrity: sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==}
-    engines: {node: '>=4.0.0'}
-    dependencies:
-      '@mrmlnc/readdir-enhanced': 2.2.1
-      '@nodelib/fs.stat': 1.1.3
-      glob-parent: 3.1.0
-      is-glob: 4.0.3
-      merge2: 1.4.1
-      micromatch: 3.1.10
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /fast-glob@3.3.0:
     resolution: {integrity: sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==}
     engines: {node: '>=8.6.0'}
@@ -11516,6 +11162,7 @@ packages:
 
   /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+    dev: true
 
   /fast-querystring@1.1.2:
     resolution: {integrity: sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==}
@@ -11529,8 +11176,8 @@ packages:
       punycode: 1.4.1
     dev: true
 
-  /fast-xml-parser@4.2.5:
-    resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==}
+  /fast-xml-parser@4.3.2:
+    resolution: {integrity: sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==}
     hasBin: true
     dependencies:
       strnum: 1.0.5
@@ -11620,22 +11267,21 @@ packages:
       tslib: 2.6.0
     dev: false
 
-  /filemanager-webpack-plugin@6.1.7(webpack@5.88.1):
-    resolution: {integrity: sha512-0hhPpmod5t0xy1hBSA9gXi0WlOHL3+x56IBt0b/VMhvbZ5/z6jakXvNOTuVmn4wOZwAORvAeH5qQ5Qs6NdPyiw==}
+  /filemanager-webpack-plugin@7.0.0(webpack@5.88.1):
+    resolution: {integrity: sha512-Td7jPFke+H9IiJmM9p1u2SPG0LTD0EFQwQU3yXKfQzN2nzHkweoKnJBjrQ713V00Pjg/fOBy5dx8G2SgIAO9GA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       webpack: ^5.0.0
     dependencies:
       '@types/archiver': 5.3.2
       archiver: 5.3.1
-      cpy: 8.1.2
       del: 6.1.1
+      fast-glob: 3.3.0
       fs-extra: 10.1.0
       is-glob: 4.0.3
-      schema-utils: 3.3.0
+      normalize-path: 3.0.0
+      schema-utils: 4.2.0
       webpack: 5.88.1(webpack-cli@4.10.0)
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /fill-range@4.0.0:
@@ -11838,8 +11484,8 @@ packages:
   /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+  /fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
@@ -11952,23 +11598,12 @@ packages:
       assert-plus: 1.0.0
     dev: true
 
-  /glob-parent@3.1.0:
-    resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==}
-    dependencies:
-      is-glob: 3.1.0
-      path-dirname: 1.0.2
-    dev: true
-
   /glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
     dependencies:
       is-glob: 4.0.3
 
-  /glob-to-regexp@0.3.0:
-    resolution: {integrity: sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==}
-    dev: true
-
   /glob-to-regexp@0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
 
@@ -12020,22 +11655,6 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /globby@9.2.0:
-    resolution: {integrity: sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==}
-    engines: {node: '>=6'}
-    dependencies:
-      '@types/glob': 7.2.0
-      array-union: 1.0.2
-      dir-glob: 2.2.2
-      fast-glob: 2.2.7
-      glob: 7.2.3
-      ignore: 4.0.6
-      pify: 4.0.1
-      slash: 2.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
@@ -12072,7 +11691,7 @@ packages:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
     dev: false
 
-  /graphql-config@4.5.0(@types/node@18.16.19)(graphql@14.3.1):
+  /graphql-config@4.5.0(@types/node@18.18.6)(graphql@14.3.1):
     resolution: {integrity: sha512-x6D0/cftpLUJ0Ch1e5sj1TZn6Wcxx4oMfmhaG9shM0DKajA9iR+j1z86GSTQ19fShbGvrSSvbIQsHku6aQ6BBw==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
@@ -12086,7 +11705,7 @@ packages:
       '@graphql-tools/json-file-loader': 7.4.18(graphql@14.3.1)
       '@graphql-tools/load': 7.8.14(graphql@14.3.1)
       '@graphql-tools/merge': 8.4.2(graphql@14.3.1)
-      '@graphql-tools/url-loader': 7.17.18(@types/node@18.16.19)(graphql@14.3.1)
+      '@graphql-tools/url-loader': 7.17.18(@types/node@18.18.6)(graphql@14.3.1)
       '@graphql-tools/utils': 9.2.1(graphql@14.3.1)
       cosmiconfig: 8.0.0
       graphql: 14.3.1
@@ -12207,13 +11826,6 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
-  /has-glob@1.0.0:
-    resolution: {integrity: sha512-D+8A457fBShSEI3tFCj65PAbT++5sKiFtdCdOam0gnfBgw9D277OERk+HM9qYJXmdVLZ/znez10SqHN0BBQ50g==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-glob: 3.1.0
-    dev: true
-
   /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
@@ -12302,13 +11914,9 @@ packages:
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
-  /heap@0.2.7:
-    resolution: {integrity: sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==}
-    dev: false
-
   /history@4.10.1:
     resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==}
     dependencies:
@@ -12556,13 +12164,6 @@ packages:
     dependencies:
       safer-buffer: 2.1.2
 
-  /iconv-lite@0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      safer-buffer: 2.1.2
-    dev: false
-
   /icss-utils@5.1.0(postcss@8.4.25):
     resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
     engines: {node: ^10 || ^12 || >= 14}
@@ -12889,13 +12490,6 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-glob@3.1.0:
-    resolution: {integrity: sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-extglob: 2.1.1
-    dev: true
-
   /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -12918,7 +12512,7 @@ packages:
   /is-lower-case@2.0.2:
     resolution: {integrity: sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /is-nan@1.3.2:
@@ -13078,7 +12672,7 @@ packages:
   /is-upper-case@2.0.2:
     resolution: {integrity: sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /is-weakref@1.0.2:
@@ -13150,7 +12744,7 @@ packages:
       '@babel/core': 7.22.8
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
+      semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -13163,7 +12757,7 @@ packages:
       '@babel/parser': 7.22.7
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
+      semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -13328,7 +12922,7 @@ packages:
       jest-validate: 26.6.2
       micromatch: 4.0.5
       pretty-format: 26.6.2
-      ts-node: 10.9.1(@types/node@18.16.19)(typescript@4.9.5)
+      ts-node: 10.9.1(@types/node@18.18.6)(typescript@4.9.5)
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -13371,7 +12965,7 @@ packages:
       '@jest/environment': 26.6.2
       '@jest/fake-timers': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       jest-mock: 26.6.2
       jest-util: 26.6.2
       jsdom: 16.7.0
@@ -13389,7 +12983,7 @@ packages:
       '@jest/environment': 26.6.2
       '@jest/fake-timers': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       jest-mock: 26.6.2
       jest-util: 26.6.2
     dev: true
@@ -13416,7 +13010,7 @@ packages:
       walker: 1.0.8
       which: 2.0.2
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -13427,7 +13021,7 @@ packages:
     dependencies:
       '@jest/types': 26.6.2
       '@types/graceful-fs': 4.1.6
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -13439,7 +13033,7 @@ packages:
       sane: 4.1.0
       walker: 1.0.8
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -13453,7 +13047,7 @@ packages:
       '@jest/source-map': 26.6.2
       '@jest/test-result': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       chalk: 4.1.2
       co: 4.6.0
       expect: 26.6.2
@@ -13483,7 +13077,7 @@ packages:
       '@jest/source-map': 26.6.2
       '@jest/test-result': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       chalk: 4.1.2
       co: 4.6.0
       expect: 26.6.2
@@ -13552,7 +13146,7 @@ packages:
     engines: {node: '>= 10.14.2'}
     dependencies:
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
     dev: true
 
   /jest-pnp-resolver@1.2.3(jest-resolve@26.6.2):
@@ -13610,7 +13204,7 @@ packages:
       '@jest/environment': 26.6.2
       '@jest/test-result': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       chalk: 4.1.2
       emittery: 0.7.2
       exit: 0.1.2
@@ -13642,7 +13236,7 @@ packages:
       '@jest/environment': 26.6.2
       '@jest/test-result': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       chalk: 4.1.2
       emittery: 0.7.2
       exit: 0.1.2
@@ -13757,7 +13351,7 @@ packages:
     resolution: {integrity: sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==}
     engines: {node: '>= 10.14.2'}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       graceful-fs: 4.2.11
     dev: true
 
@@ -13813,7 +13407,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.1
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -13838,7 +13432,7 @@ packages:
     dependencies:
       '@jest/test-result': 26.6.2
       '@jest/types': 26.6.2
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       jest-util: 26.6.2
@@ -13857,7 +13451,7 @@ packages:
     resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       merge-stream: 2.0.0
       supports-color: 7.2.0
     dev: true
@@ -13866,7 +13460,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 20.4.1
+      '@types/node': 18.16.19
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
@@ -14129,14 +13723,6 @@ packages:
     resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
     dev: true
 
-  /jsonpath@1.1.1:
-    resolution: {integrity: sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==}
-    dependencies:
-      esprima: 1.2.2
-      static-eval: 2.0.2
-      underscore: 1.12.1
-    dev: false
-
   /jsprim@2.0.2:
     resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
     engines: {'0': node >=0.6.0}
@@ -14157,11 +13743,6 @@ packages:
       object.values: 1.1.6
     dev: true
 
-  /junk@3.1.0:
-    resolution: {integrity: sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /just-extend@4.2.1:
     resolution: {integrity: sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==}
     dev: false
@@ -14179,10 +13760,6 @@ packages:
       json-buffer: 3.0.0
     dev: true
 
-  /khroma@2.0.0:
-    resolution: {integrity: sha512-2J8rDNlQWbtiNYThZRvmMv5yt44ZakX+Tz5ZIp/mN1pt4snn+m030Va5Z4v8xA0cQFDXBwO/8i42xL4QPsVk3g==}
-    dev: false
-
   /kind-of@3.2.2:
     resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
     engines: {node: '>=0.10.0'}
@@ -14234,14 +13811,6 @@ packages:
       picocolors: 1.0.0
       shell-quote: 1.8.1
 
-  /layout-base@1.0.2:
-    resolution: {integrity: sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==}
-    dev: false
-
-  /layout-base@2.0.1:
-    resolution: {integrity: sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==}
-    dev: false
-
   /lazy-ass@1.6.0:
     resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
     engines: {node: '> 0.8'}
@@ -14259,14 +13828,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /levn@0.3.0:
-    resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      prelude-ls: 1.1.2
-      type-check: 0.3.2
-    dev: false
-
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
@@ -14375,10 +13936,6 @@ packages:
     dependencies:
       p-locate: 4.1.0
 
-  /lodash-es@4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
-    dev: false
-
   /lodash-id@0.14.1:
     resolution: {integrity: sha512-ikQPBTiq/d5m6dfKQlFdIXFzvThPi2Be9/AHxktOnDSfSxE1j9ICbBT5Elk1ke7HSTgM38LHTpmJovo9/klnLg==}
     engines: {node: '>= 4'}
@@ -14505,13 +14062,13 @@ packages:
   /lower-case-first@2.0.2:
     resolution: {integrity: sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /lowercase-keys@1.0.1:
@@ -14551,7 +14108,7 @@ packages:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
     dependencies:
-      semver: 6.3.0
+      semver: 6.3.1
     dev: true
 
   /make-error@1.3.6:
@@ -14631,28 +14188,7 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
-  /mermaid@9.4.3:
-    resolution: {integrity: sha512-TLkQEtqhRSuEHSE34lh5bCa94KATCyluAXmFnNI2PRZwOpXFeqiJWwZl+d2CcemE1RS6QbbueSSq9QIg8Uxcyw==}
-    dependencies:
-      '@braintree/sanitize-url': 6.0.2
-      cytoscape: 3.25.0
-      cytoscape-cose-bilkent: 4.1.0(cytoscape@3.25.0)
-      cytoscape-fcose: 2.2.0(cytoscape@3.25.0)
-      d3: 7.8.5
-      dagre-d3-es: 7.0.9
-      dayjs: 1.11.9
-      dompurify: 2.4.3
-      elkjs: 0.8.2
-      khroma: 2.0.0
-      lodash-es: 4.17.21
-      non-layered-tidy-tree-layout: 2.0.2
-      stylis: 4.3.0
-      ts-dedent: 2.2.0
-      uuid: 9.0.0
-      web-worker: 1.2.0
-    dev: false
-
-  /meros@1.3.0(@types/node@18.16.19):
+  /meros@1.3.0(@types/node@18.18.6):
     resolution: {integrity: sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==}
     engines: {node: '>=13'}
     peerDependencies:
@@ -14661,7 +14197,7 @@ packages:
       '@types/node':
         optional: true
     dependencies:
-      '@types/node': 18.16.19
+      '@types/node': 18.18.6
     dev: true
 
   /method-override@3.0.0:
@@ -14852,47 +14388,47 @@ packages:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: false
 
-  /monaco-editor-webpack-plugin@7.1.0(monaco-editor@0.33.0)(webpack@5.88.1):
+  /monaco-editor-webpack-plugin@7.1.0(monaco-editor@0.39.0)(webpack@5.88.1):
     resolution: {integrity: sha512-ZjnGINHN963JQkFqjjcBtn1XBtUATDZBMgNQhDQwd78w2ukRhFXAPNgWuacaQiDZsUr4h1rWv5Mv6eriKuOSzA==}
     peerDependencies:
-      monaco-editor: '>= 0.31.0'
+      monaco-editor: ^0.39.0
       webpack: ^4.5.0 || 5.x
     dependencies:
       loader-utils: 2.0.4
-      monaco-editor: 0.33.0
+      monaco-editor: 0.39.0
       webpack: 5.88.1(webpack-cli@4.10.0)
     dev: false
 
-  /monaco-editor@0.33.0:
-    resolution: {integrity: sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==}
+  /monaco-editor@0.39.0:
+    resolution: {integrity: sha512-zhbZ2Nx93tLR8aJmL2zI1mhJpsl87HMebNBM6R8z4pLfs8pj604pIVIVwyF1TivcfNtIPpMXL+nb3DsBmE/x6Q==}
     dev: false
 
-  /monaco-marker-data-provider@1.1.1(monaco-editor@0.33.0):
+  /monaco-marker-data-provider@1.1.1(monaco-editor@0.39.0):
     resolution: {integrity: sha512-PGB7TJSZE5tmHzkxv/OEwK2RGNC2A7dcq4JRJnnj31CUAsfmw0Gl+1QTrH0W0deKhcQmQM0YVPaqgQ+0wCt8Mg==}
     peerDependencies:
-      monaco-editor: '>=0.30.0'
+      monaco-editor: ^0.39.0
     dependencies:
-      monaco-editor: 0.33.0
+      monaco-editor: 0.39.0
     dev: false
 
-  /monaco-worker-manager@2.0.1(monaco-editor@0.33.0):
+  /monaco-worker-manager@2.0.1(monaco-editor@0.39.0):
     resolution: {integrity: sha512-kdPL0yvg5qjhKPNVjJoym331PY/5JC11aPJXtCZNwWRvBr6jhkIamvYAyiY5P1AWFmNOy0aRDRoMdZfa71h8kg==}
     peerDependencies:
-      monaco-editor: '>=0.30.0'
+      monaco-editor: ^0.39.0
     dependencies:
-      monaco-editor: 0.33.0
+      monaco-editor: 0.39.0
     dev: false
 
-  /monaco-yaml@4.0.4(monaco-editor@0.33.0):
+  /monaco-yaml@4.0.4(monaco-editor@0.39.0):
     resolution: {integrity: sha512-qbM36fY1twpDUs4lhhxoXDQGUPVyYAFCPJi3E0JKgLioD8wzsD/pawgauFFXSzpMa09z8wbt/DTLXjXEehnVFA==}
     peerDependencies:
-      monaco-editor: '>=0.30'
+      monaco-editor: ^0.39.0
     dependencies:
       '@types/json-schema': 7.0.12
       jsonc-parser: 3.2.0
-      monaco-editor: 0.33.0
-      monaco-marker-data-provider: 1.1.1(monaco-editor@0.33.0)
-      monaco-worker-manager: 2.0.1(monaco-editor@0.33.0)
+      monaco-editor: 0.39.0
+      monaco-marker-data-provider: 1.1.1(monaco-editor@0.39.0)
+      monaco-worker-manager: 2.0.1(monaco-editor@0.39.0)
       path-browserify: 1.0.1
       prettier: 2.8.8
       vscode-languageserver-textdocument: 1.0.8
@@ -15006,16 +14542,12 @@ packages:
   /neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  /nested-error-stacks@2.1.1:
-    resolution: {integrity: sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==}
-    dev: true
-
   /nice-try@1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
 
-  /nise@5.1.4:
-    resolution: {integrity: sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==}
+  /nise@5.1.5:
+    resolution: {integrity: sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==}
     dependencies:
       '@sinonjs/commons': 2.0.0
       '@sinonjs/fake-timers': 10.3.0
@@ -15028,7 +14560,7 @@ packages:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /node-fetch@2.6.12:
@@ -15124,10 +14656,6 @@ packages:
       readable-stream: 1.0.34
     dev: true
 
-  /non-layered-tidy-tree-layout@2.0.2:
-    resolution: {integrity: sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==}
-    dev: false
-
   /nopt@1.0.10:
     resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==}
     hasBin: true
@@ -15140,7 +14668,7 @@ packages:
     dependencies:
       hosted-git-info: 2.8.9
       resolve: 1.22.2
-      semver: 5.7.1
+      semver: 5.7.2
       validate-npm-package-license: 3.0.4
     dev: true
 
@@ -15341,18 +14869,6 @@ packages:
     dependencies:
       '@wry/context': 0.4.4
 
-  /optionator@0.8.3:
-    resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.3.0
-      prelude-ls: 1.1.2
-      type-check: 0.3.2
-      word-wrap: 1.2.3
-    dev: false
-
   /optionator@0.9.3:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
@@ -15393,13 +14909,6 @@ packages:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
     dev: true
 
-  /p-all@2.1.0:
-    resolution: {integrity: sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==}
-    engines: {node: '>=6'}
-    dependencies:
-      p-map: 2.1.0
-    dev: true
-
   /p-cancelable@1.1.0:
     resolution: {integrity: sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==}
     engines: {node: '>=6'}
@@ -15410,20 +14919,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /p-event@4.2.0:
-    resolution: {integrity: sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-timeout: 3.2.0
-    dev: true
-
-  /p-filter@2.1.0:
-    resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-map: 2.1.0
-    dev: true
-
   /p-finally@1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
@@ -15455,18 +14950,6 @@ packages:
     dependencies:
       p-limit: 2.3.0
 
-  /p-map@2.1.0:
-    resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /p-map@3.0.0:
-    resolution: {integrity: sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      aggregate-error: 3.1.0
-    dev: true
-
   /p-map@4.0.0:
     resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
     engines: {node: '>=10'}
@@ -15481,13 +14964,6 @@ packages:
       '@types/retry': 0.12.0
       retry: 0.13.1
 
-  /p-timeout@3.2.0:
-    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-finally: 1.0.0
-    dev: true
-
   /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
@@ -15580,7 +15056,7 @@ packages:
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /pascalcase@0.1.1:
@@ -15595,11 +15071,7 @@ packages:
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.1
-    dev: true
-
-  /path-dirname@1.0.2:
-    resolution: {integrity: sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==}
+      tslib: 2.6.0
     dev: true
 
   /path-exists@3.0.0:
@@ -15655,13 +15127,6 @@ packages:
     resolution: {integrity: sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==}
     dev: true
 
-  /path-type@3.0.0:
-    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
-    engines: {node: '>=4'}
-    dependencies:
-      pify: 3.0.0
-    dev: true
-
   /path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
@@ -15711,11 +15176,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /pify@4.0.1:
-    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
-    engines: {node: '>=6'}
-    dev: true
-
   /pirates@4.0.6:
     resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
     engines: {node: '>= 6'}
@@ -16113,11 +15573,6 @@ packages:
     resolution: {integrity: sha512-gdr1MBNVT0drzTq95CbSNdsrBDoHGlb2aDJP/FoY+1e+jSDPOb1Cv554gH2MGiSr2WTcXi/zu+NaFzfcHQkfBQ==}
     dev: false
 
-  /prelude-ls@1.1.2:
-    resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
-    engines: {node: '>= 0.8.0'}
-    dev: false
-
   /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -16690,15 +16145,15 @@ packages:
       react: 17.0.2
     dev: false
 
-  /react-monaco-editor@0.49.0(@types/react@17.0.5)(monaco-editor@0.33.0)(react@17.0.2):
-    resolution: {integrity: sha512-KZTNn1vJh1rlzIRPXjr/5HWYMPfbOoDhR+prCR7mIQCssjlkn8+SfpN4lNsiCTECo/UdpnyAdqgaIyY3yYjVeg==}
+  /react-monaco-editor@0.54.0(@types/react@17.0.5)(monaco-editor@0.39.0)(react@17.0.2):
+    resolution: {integrity: sha512-9JwO69851mfpuhYLHlKbae7omQWJ/2ICE2lbL0VHyNyZR8rCOH7440u+zAtDgiOMpLwmYdY1sEZCdRefywX6GQ==}
     peerDependencies:
       '@types/react': 17.0.5
-      monaco-editor: ^0.33.0
-      react: '>=17 <= 18'
+      monaco-editor: ^0.39.0
+      react: '>=16 <= 18'
     dependencies:
       '@types/react': 17.0.5
-      monaco-editor: 0.33.0
+      monaco-editor: 0.39.0
       prop-types: 15.8.1
       react: 17.0.2
     dev: false
@@ -17227,10 +16682,6 @@ packages:
       inherits: 2.0.4
     dev: true
 
-  /robust-predicates@3.0.2:
-    resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==}
-    dev: false
-
   /rst-selector-parser@2.2.3:
     resolution: {integrity: sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==}
     dependencies:
@@ -17254,10 +16705,6 @@ packages:
       queue-microtask: 1.2.3
     dev: true
 
-  /rw@1.3.3:
-    resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}
-    dev: false
-
   /rxjs@6.6.7:
     resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
     engines: {npm: '>=2.0.0'}
@@ -17382,8 +16829,8 @@ packages:
       source-map-js: 1.0.2
     dev: false
 
-  /sax@1.2.4:
-    resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
+  /sax@1.3.0:
+    resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
     dev: false
 
   /saxes@5.0.1:
@@ -17459,11 +16906,21 @@ packages:
     hasBin: true
     dev: true
 
+  /semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
+    dev: true
+
   /semver@6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
     dev: true
 
+  /semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+    dev: true
+
   /semver@7.0.0:
     resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
     hasBin: true
@@ -17500,7 +16957,7 @@ packages:
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
       upper-case-first: 2.0.2
     dev: true
 
@@ -17665,12 +17122,13 @@ packages:
 
   /sinon@11.1.2:
     resolution: {integrity: sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==}
+    deprecated: 16.1.1
     dependencies:
       '@sinonjs/commons': 1.8.6
       '@sinonjs/fake-timers': 7.1.2
       '@sinonjs/samsam': 6.1.3
       diff: 5.1.0
-      nise: 5.1.4
+      nise: 5.1.5
       supports-color: 7.2.0
     dev: false
 
@@ -17678,11 +17136,6 @@ packages:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
     dev: true
 
-  /slash@2.0.0:
-    resolution: {integrity: sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==}
-    engines: {node: '>=6'}
-    dev: true
-
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -17710,7 +17163,7 @@ packages:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /snapdragon-node@2.1.1:
@@ -17861,7 +17314,7 @@ packages:
   /sponge-case@1.0.1:
     resolution: {integrity: sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /sprintf-js@1.0.3:
@@ -17914,12 +17367,6 @@ packages:
       - supports-color
     dev: true
 
-  /static-eval@2.0.2:
-    resolution: {integrity: sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==}
-    dependencies:
-      escodegen: 1.14.3
-    dev: false
-
   /static-extend@0.1.2:
     resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
     engines: {node: '>=0.10.0'}
@@ -18166,10 +17613,6 @@ packages:
       postcss-selector-parser: 6.0.13
     dev: true
 
-  /stylis@4.3.0:
-    resolution: {integrity: sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==}
-    dev: false
-
   /subscriptions-transport-ws@0.9.19(graphql@14.3.1):
     resolution: {integrity: sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw==}
     deprecated: The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws    For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md
@@ -18224,10 +17667,6 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  /svg-pan-zoom@3.6.1:
-    resolution: {integrity: sha512-JaKkGHHfGvRrcMPdJWkssLBeWqM+Isg/a09H7kgNNajT1cX5AztDTNs+C8UzpCxjCTRrG34WbquwaovZbmSk9g==}
-    dev: false
-
   /svg-url-loader@7.1.1(webpack@5.88.1):
     resolution: {integrity: sha512-NlsMCePODm7FQhU9aEZyGLPx5Xe1QRI1cSEUE6vTq5LJc9l9pStagvXoEIyZ9O3r00w6G3+Wbkimb+SC3DI/Aw==}
     engines: {node: '>=10'}
@@ -18269,7 +17708,7 @@ packages:
   /swap-case@2.0.2:
     resolution: {integrity: sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /symbol-observable@1.2.0:
@@ -18429,7 +17868,7 @@ packages:
   /title-case@3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /tmp@0.0.33:
@@ -18554,11 +17993,6 @@ packages:
     hasBin: true
     dev: true
 
-  /ts-dedent@2.2.0:
-    resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
-    engines: {node: '>=6.10'}
-    dev: false
-
   /ts-invariant@0.4.4:
     resolution: {integrity: sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==}
     dependencies:
@@ -18605,7 +18039,7 @@ packages:
     resolution: {integrity: sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==}
     dev: true
 
-  /ts-node@10.9.1(@types/node@18.16.19)(typescript@4.9.5):
+  /ts-node@10.9.1(@types/node@18.18.6)(typescript@4.9.5):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -18624,7 +18058,7 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 18.16.19
+      '@types/node': 18.18.6
       acorn: 8.10.0
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -18687,13 +18121,6 @@ packages:
     resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
     dev: true
 
-  /type-check@0.3.2:
-    resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      prelude-ls: 1.1.2
-    dev: false
-
   /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
@@ -18778,10 +18205,6 @@ packages:
     resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
     dev: true
 
-  /underscore@1.12.1:
-    resolution: {integrity: sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==}
-    dev: false
-
   /unicode-canonical-property-names-ecmascript@2.0.0:
     resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
     engines: {node: '>=4'}
@@ -18952,13 +18375,13 @@ packages:
   /upper-case-first@2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /upper-case@2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.6.0
     dev: true
 
   /uri-js@4.4.1:
@@ -19112,11 +18535,6 @@ packages:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
     hasBin: true
 
-  /uuid@9.0.0:
-    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
-    hasBin: true
-    dev: false
-
   /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
     dev: true
@@ -19433,10 +18851,10 @@ packages:
     resolution: {integrity: sha512-xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==}
     dependencies:
       jsonc-parser: 3.2.0
-      vscode-languageserver-textdocument: 1.0.8
-      vscode-languageserver-types: 3.17.3
+      vscode-languageserver-textdocument: 1.0.11
+      vscode-languageserver-types: 3.17.5
       vscode-nls: 5.2.0
-      vscode-uri: 3.0.7
+      vscode-uri: 3.0.8
     dev: false
 
   /vscode-jsonrpc@6.0.0:
@@ -19451,6 +18869,10 @@ packages:
       vscode-languageserver-types: 3.16.0
     dev: false
 
+  /vscode-languageserver-textdocument@1.0.11:
+    resolution: {integrity: sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==}
+    dev: false
+
   /vscode-languageserver-textdocument@1.0.8:
     resolution: {integrity: sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==}
     dev: false
@@ -19463,6 +18885,10 @@ packages:
     resolution: {integrity: sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==}
     dev: false
 
+  /vscode-languageserver-types@3.17.5:
+    resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==}
+    dev: false
+
   /vscode-languageserver@7.0.0:
     resolution: {integrity: sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==}
     hasBin: true
@@ -19478,6 +18904,10 @@ packages:
     resolution: {integrity: sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==}
     dev: false
 
+  /vscode-uri@3.0.8:
+    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
+    dev: false
+
   /w3c-hr-time@1.0.2:
     resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
     deprecated: Use your platform's native performance.now() and performance.timeOrigin.
@@ -19545,10 +18975,6 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
-  /web-worker@1.2.0:
-    resolution: {integrity: sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==}
-    dev: false
-
   /webcrypto-core@1.7.7:
     resolution: {integrity: sha512-7FjigXNsBfopEj+5DV2nhNpfic2vumtjjgPmeDKk45z+MJwXKKfhPB7118Pfzrmh4jqOMST6Ch37iPAHoImg5g==}
     dependencies:
@@ -19823,11 +19249,6 @@ packages:
   /wildcard@2.0.1:
     resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==}
 
-  /word-wrap@1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
   /wrap-ansi@5.1.0:
     resolution: {integrity: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==}
     engines: {node: '>=6'}
@@ -19901,7 +19322,7 @@ packages:
     resolution: {integrity: sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==}
     hasBin: true
     dependencies:
-      sax: 1.2.4
+      sax: 1.3.0
     dev: false
 
   /xml-name-validator@3.0.0:
diff --git a/ui-packages/pnpm-workspace.yaml b/ui-packages/pnpm-workspace.yaml
index 18ec407efc..73d3ae8fa3 100644
--- a/ui-packages/pnpm-workspace.yaml
+++ b/ui-packages/pnpm-workspace.yaml
@@ -1,2 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 packages:
   - 'packages/*'
diff --git a/ui-packages/pom.xml b/ui-packages/pom.xml
index a891aa52bf..3e121775dc 100644
--- a/ui-packages/pom.xml
+++ b/ui-packages/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0">